OSDN Git Service

(root) / mikumikustudio / libgdx-mikumikustudio.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 04f4b9b cfcef0e)
Merge branch 'master' of https://github.com/libgdx/libgdx into new3dapi
authorXoppa <contact@xoppa.nl>
Sun, 3 Feb 2013 18:33:48 +0000 (19:33 +0100)
committerXoppa <contact@xoppa.nl>
Sun, 3 Feb 2013 18:33:48 +0000 (19:33 +0100)
Conflicts:
tests/gdx-tests/src/com/badlogic/gdx/tests/utils/GdxTests.java


Trivial merge
About OSDN
Find Software
Develop Software
Help