Kirill Vainer cb61e760ce Merge branch 'master' into BorealFeast-master ...

Conflicts:
	jme3-core/src/main/java/com/jme3/material/RenderState.java
	jme3-core/src/main/java/com/jme3/renderer/opengl/GL.java

2016-04-10 12:51:19 -04:00

..

src/main

Merge branch 'master' into BorealFeast-master

2016-04-10 12:51:19 -04:00

build.gradle

Add android.jar to root project and use during jme-android project build.

2014-12-08 22:50:33 -05:00