OSDN Git Service

Merge branch 'new3dapi' of https://github.com/libgdx/libgdx into new3dapi
authorXoppa <contact@xoppa.nl>
Sun, 24 Mar 2013 22:36:33 +0000 (23:36 +0100)
committerXoppa <contact@xoppa.nl>
Sun, 24 Mar 2013 22:36:33 +0000 (23:36 +0100)
commit29e3b54290cc97e34363a270649e9d1e5ac03c0b
tree8a96d687442834b58620364f6f93922ebbdf35a6
parent249d375bbb85e68e0a0deac40f26e80d7cdcea59
parentc2f92ec6712126822d211b3c5e5052d6aee3be84
Merge branch 'new3dapi' of https://github.com/libgdx/libgdx into new3dapi

Conflicts:
gdx/src/com/badlogic/gdx/graphics/g3d/Model.java
gdx/src/com/badlogic/gdx/graphics/g3d/ModelBatch.java
tests/gdx-tests/src/com/badlogic/gdx/tests/g3d/BatchRenderTest.java
gdx/src/com/badlogic/gdx/graphics/g3d/Model.java
gdx/src/com/badlogic/gdx/graphics/g3d/ModelBatch.java
gdx/src/com/badlogic/gdx/graphics/g3d/test/TestShader.java