OSDN Git Service

Merge branch 'master' of https://github.com/libgdx/libgdx into new3dapi
authorXoppa <contact@xoppa.nl>
Mon, 4 Mar 2013 15:04:31 +0000 (16:04 +0100)
committerXoppa <contact@xoppa.nl>
Mon, 4 Mar 2013 15:04:31 +0000 (16:04 +0100)
commit58ad9db626f2320161169ec1874a0fcf98a5340a
tree0a48386dc4541ffcc2389286ff32e32299370431
parent18c5d6add85657634d0376f18d823147466fb752
parenta2a88867322377155e1324f3de2b132734ce055a
Merge branch 'master' of https://github.com/libgdx/libgdx into new3dapi

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