OSDN Git Service

Merge remote-tracking branch 'upstream/master' into gdx-tiled-packer-redux-gles2
authorManuel Bua <manuel.bua@gmail.com>
Wed, 8 May 2013 20:27:01 +0000 (22:27 +0200)
committerManuel Bua <manuel.bua@gmail.com>
Wed, 8 May 2013 20:27:01 +0000 (22:27 +0200)
commitf824bf708cf4eca0f06fdd6fcf75cdbd891565f0
treea06c9b98323954d2353618537f89e98c1a38c252
parent0dc8d248c3841d46c72501ae62386fc9e3b8919c
parent41968e5c86c7bde0f6bf578285f61042f31e95ad
Merge remote-tracking branch 'upstream/master' into gdx-tiled-packer-redux-gles2