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

..

main

Merge branch 'master' into PBRisComing

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

plugins/java/com/jme3

Merge branch 'master' into PBRisComing

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

test/java/com/jme3

build: enable assertion for test and run (previously only test as assertionEnabled = true)

2015-03-06 10:47:04 +01:00

tools/java/jme3tools

Merge branch 'master' of https://github.com/jMonkeyEngine/jmonkeyengine into GL4ShaderSupport

2015-03-01 09:48:36 +01:00