OSDN Git Service

fixed merge conflicts, removed evil e.printStackTrace()...
authorMario Zechner <contact@badlogicgames.com>
Sat, 16 Feb 2013 14:51:31 +0000 (15:51 +0100)
committerMario Zechner <contact@badlogicgames.com>
Sat, 16 Feb 2013 14:51:31 +0000 (15:51 +0100)
commit87a46ad9a3f62ab749ad7cf0974546dfa23140d0
tree49be5b939b94866cebc3dec1babc1bdc543c3eba
parent0d0531a46d42c5498c3ba14c942b333f0ad8b89c
parent3b489d4be024ff259ed21ddd6ca98f6cf5e52396
fixed merge conflicts, removed evil e.printStackTrace()...
gdx/src/com/badlogic/gdx/maps/Map.java
gdx/src/com/badlogic/gdx/maps/tiled/TiledMap.java
gdx/src/com/badlogic/gdx/maps/tiled/TmxMapLoader.java