OSDN Git Service

Merge branch 'master' of https://github.com/libgdx/libgdx into 3dapi
authorXoppa <contact@xoppa.nl>
Fri, 27 Sep 2013 23:06:50 +0000 (01:06 +0200)
committerXoppa <contact@xoppa.nl>
Fri, 27 Sep 2013 23:06:50 +0000 (01:06 +0200)
commitb1c82dbace8c958fe68903746915ff89ecd09804
treee178b2559b23d8838d0d2add371ba6192a27776b
parent79bc6c74aae7ef5df50770023bde8a1e86a69a33
parent00d1104f15561c9a7ff1060ce19f623b930f37f3
Merge branch 'master' of https://github.com/libgdx/libgdx into 3dapi
gdx/src/com/badlogic/gdx/graphics/g3d/Model.java
gdx/src/com/badlogic/gdx/graphics/g3d/loader/ObjLoader.java