OSDN Git Service

(root) / mikumikustudio / libgdx-mikumikustudio.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fe398cf 3a11b5d)
Merge branch 'master' of https://github.com/libgdx/libgdx
authorblackbluegl <info@blackbluegl.de>
Tue, 28 May 2013 08:31:42 +0000 (10:31 +0200)
committerblackbluegl <info@blackbluegl.de>
Tue, 28 May 2013 08:31:42 +0000 (10:31 +0200)
Conflicts:
tests/gdx-tests-android/assets/data/g3d/ship.png
tests/gdx-tests/src/com/badlogic/gdx/tests/g3d/BaseG3dHudTest.java


Trivial merge
About OSDN
Find Software
Develop Software
Help