OSDN Git Service

Merge branch 'master' of https://github.com/libgdx/libgdx into new3dapi
authorXoppa <contact@xoppa.nl>
Sat, 18 May 2013 20:17:45 +0000 (22:17 +0200)
committerXoppa <contact@xoppa.nl>
Sat, 18 May 2013 20:17:45 +0000 (22:17 +0200)
commit0ce56c15161068bf87d34e68edd11c8b00efe5b6
treeeee29d7c6719e252e51b89dd62578fba521385b9
parent45ee00f126e6ce0c30ab92064c0dc4f8f676a53a
parent990942b70e2da71bfb130c74546ef770e7ef0aa8
Merge branch 'master' of https://github.com/libgdx/libgdx into new3dapi

Conflicts:
tests/gdx-tests-lwjgl/src/com/badlogic/gdx/tests/lwjgl/LwjglDebugStarter.java
tests/gdx-tests/src/com/badlogic/gdx/tests/utils/GdxTests.java
gdx/src/com/badlogic/gdx/utils/JsonReader.java
tests/gdx-tests-lwjgl/src/com/badlogic/gdx/tests/lwjgl/LwjglDebugStarter.java