OSDN Git Service

Merge branch 'master' of https://github.com/libgdx/libgdx into new3dapi
authorXoppa <contact@xoppa.nl>
Fri, 11 Jan 2013 17:41:56 +0000 (18:41 +0100)
committerXoppa <contact@xoppa.nl>
Fri, 11 Jan 2013 17:41:56 +0000 (18:41 +0100)
commit35970ca2ec5c501217bbbf2f50b897c454260751
treede693edc8fbca311e08224ed93a722c20288b80a
parentbc95ff3cf8d6c7aca07078c85d0f025c9a55229a
parent49c872e96526bc3d303d2b3886e009cc532933be
Merge branch 'master' of https://github.com/libgdx/libgdx into new3dapi

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