Nehon e1d0e06c59 Merge branch 'master' into PBRisComing ...

Conflicts:
	jme3-core/src/main/java/com/jme3/material/TechniqueDef.java

2015-04-11 16:01:01 +02:00

..

src/main/resources

PBR shader and PBR test case with custom model

2015-04-11 15:37:05 +02:00

build.gradle

jme3-testdata: fix issue #241

2015-03-27 22:21:14 -04:00