Daniel Johansson c32ac172fb Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	jme3-core/src/main/java/com/jme3/light/AmbientLight.java
	jme3-core/src/main/java/com/jme3/light/DirectionalLight.java
	jme3-core/src/main/java/com/jme3/light/PointLight.java
	jme3-core/src/main/java/com/jme3/light/SpotLight.java

2015-09-03 13:48:23 +01:00

..

src

Merge remote-tracking branch 'upstream/master'

2015-09-03 13:48:23 +01:00

build.gradle

build: separate full version from full name

2015-08-08 17:57:59 -04:00