NathanSweet 15015a12e0 Merge branch 'master' into dev
# Conflicts:
#	spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/AnimationStateTest.java
#	spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/BoneData.java
2016-10-15 23:50:01 +02:00
..
2016-10-15 23:50:01 +02:00