OSDN Git Service

Merge remote-tracking branch 'siondream/mapsapi' into mapsapi
authorJustin Shapcott <support@mobidevelop.com>
Sat, 16 Feb 2013 04:33:31 +0000 (21:33 -0700)
committerJustin Shapcott <support@mobidevelop.com>
Sat, 16 Feb 2013 04:33:31 +0000 (21:33 -0700)
commit3b489d4be024ff259ed21ddd6ca98f6cf5e52396
treee7b3c131fcfad2b398c7250b8061e7d680309982
parent8e6401ff54dfe697c12ffd9754aa2ac27ad9371c
parent327f1eceaa824fe560a550dcb16f3e973c72c3ca
Merge remote-tracking branch 'siondream/mapsapi' into mapsapi

Conflicts:
gdx/src/com/badlogic/gdx/maps/tiled/TiledMapRenderer.java
gdx/src/com/badlogic/gdx/maps/loaders/TmxMapLoader.java
gdx/src/com/badlogic/gdx/maps/tiled/TiledMapRenderer.java
gdx/src/com/badlogic/gdx/maps/tiled/TiledMapTileLayer.java