OSDN Git Service

Merge branch 'master' of https://github.com/libgdx/libgdx into new3dapi
authorXoppa <contact@xoppa.nl>
Thu, 10 Jan 2013 01:47:55 +0000 (02:47 +0100)
committerXoppa <contact@xoppa.nl>
Thu, 10 Jan 2013 01:47:55 +0000 (02:47 +0100)
commit32b71d99fa191ac5be1857e595178211211a0013
treed439d91ee110ddafabaf76d2a84b118164089c24
parent3dd8902d6df7f27124f6efbd469513673098f1f8
parenta1c096dbdafce46b37f1a4c9e5b3205763262f8d
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