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

Merge branch 'master' into PBRisComing

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

build.gradle

Copy jme3-android-native and jme3-bullet-native-android to the dist/opt folder as part of build

2015-02-08 00:11:46 -05:00