NathanSweet be01e0aae3 Merge branch 'master' into dev
# Conflicts:
#	spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy.json
#	spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java
2016-08-05 01:22:08 +02:00
..