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

Merge branch 'master' into PBRisComing

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

build.gradle

Build: fix build failure if not building from git repo

2015-03-20 23:51:15 -04:00