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

..

.settings

Changed tests to Java 1.7.

2016-04-03 19:11:04 +02:00

assets

Merge branch 'master' into dev

2016-08-05 01:22:08 +02:00

src/com/esotericsoftware/spine

Merge branch 'master' into dev

2016-08-05 01:22:08 +02:00

.classpath

Changed tests to Java 1.7.

2016-04-03 19:11:04 +02:00

.project

Organized spine-libgdx so tests and the skeleton viewer are separate.

2014-11-20 12:42:54 +01:00