Merge branch 'master' of https://github.com/libgdx/libgdx into 3dapi

author Xoppa <contact@xoppa.nl>

Fri, 27 Sep 2013 23:06:50 +0000 (01:06 +0200)

committer Xoppa <contact@xoppa.nl>

Fri, 27 Sep 2013 23:06:50 +0000 (01:06 +0200)
author Xoppa <contact@xoppa.nl>
Fri, 27 Sep 2013 23:06:50 +0000 (01:06 +0200)
committer Xoppa <contact@xoppa.nl>
Fri, 27 Sep 2013 23:06:50 +0000 (01:06 +0200)
diff --cc gdx/src/com/badlogic/gdx/graphics/g3d/Model.java
Simple merge
diff --cc gdx/src/com/badlogic/gdx/graphics/g3d/loader/ObjLoader.java
Simple merge
author	Xoppa <contact@xoppa.nl>
	Fri, 27 Sep 2013 23:06:50 +0000 (01:06 +0200)
committer	Xoppa <contact@xoppa.nl>
	Fri, 27 Sep 2013 23:06:50 +0000 (01:06 +0200)
		1	2
gdx/src/com/badlogic/gdx/graphics/g3d/Model.java	patch \|	diff1 \|	diff2 \|	blob \| history
gdx/src/com/badlogic/gdx/graphics/g3d/loader/ObjLoader.java	patch \|	diff1 \|	diff2 \|	blob \| history