Nehon 6a9c655be3 Merge branch 'master' into PBRisComing ...

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

2016-04-10 10:59:45 +02:00

..

src

Merge branch 'master' into PBRisComing

2016-04-10 10:59:45 +02:00

build.gradle

Merge remote-tracking branch 'upstream/master' into issue295

2015-09-08 09:25:29 +01:00