OSDN Git Service

Merge branch 'mapsapi' of https://github.com/libgdx/libgdx into mapsapi
authorJustin Shapcott <support@mobidevelop.com>
Sun, 17 Feb 2013 20:40:42 +0000 (13:40 -0700)
committerJustin Shapcott <support@mobidevelop.com>
Sun, 17 Feb 2013 20:40:42 +0000 (13:40 -0700)
commit9923a4f2c8dba5a8a946658d43b6774a4269e746
treea7ff238ed543ea04a17fb3a74b7fde7e08b966fd
parent96093a8dddc90bdf7b0ef663a3ad7f5757c8fad2
parent9b915fa50165aef03863b677fe5b47d615d76a09
Merge branch 'mapsapi' of https://github.com/libgdx/libgdx into mapsapi

Conflicts:
gdx/src/com/badlogic/gdx/maps/tiled/TiledMapRenderer.java
tests/gdx-tests/src/com/badlogic/gdx/tests/TiledMapAssetManagerTest.java
tests/gdx-tests/src/com/badlogic/gdx/tests/TiledMapDirectLoaderTest.java
tests/gdx-tests/src/com/badlogic/gdx/tests/bench/TiledMapBench.java
gdx/src/com/badlogic/gdx/maps/tiled/TiledMapRenderer.java
tests/gdx-tests/src/com/badlogic/gdx/tests/TiledMapDirectLoaderTest.java