OSDN Git Service

(root) / mikumikustudio / libgdx-mikumikustudio.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fee7ec7 de8d0c0)
Merge branch 'jw_livewallpaper_0.9.8' of https://github.com/jwisniewski/libgdx into...
authorAriel Coppes <ariel.coppes@gemserk.com>
Sat, 23 Mar 2013 21:11:34 +0000 (18:11 -0300)
committerAriel Coppes <ariel.coppes@gemserk.com>
Sat, 23 Mar 2013 21:11:34 +0000 (18:11 -0300)
commit34d201a8d119adb078083e2307c258acad734081
tree22b3c03d67a943ff51ed5026e02f989e3442560btree | snapshot
parentfee7ec73cfcc632ace7a4651005a3213adb3cbe3commit | diff
parentde8d0c0a6b2612285502aca632391cd3dd218496commit | diff
Merge branch 'jw_livewallpaper_0.9.8' of https://github.com/jwisniewski/libgdx into lwpredesign2

Conflicts:
backends/gdx-backend-android/src/com/badlogic/gdx/backends/android/AndroidGraphicsLiveWallpaper.java
backends/gdx-backend-android/src/com/badlogic/gdx/backends/android/AndroidLiveWallpaper.java
About OSDN
Find Software
Develop Software
Help