Disk1of5 3da5dcef69 Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	spine-libgdx/.classpath
	spine-libgdx/test/com/esotericsoftware/spine/MixTest.java
	spine-libgdx/test/com/esotericsoftware/spine/SkeletonTest.java

*First Merge attempt.. may Gawd help us all.  -Disk1of5.

2013-03-15 11:58:48 -06:00

..

.settings

libgdx runtime, attachment loader instead of resolver.

2013-03-12 23:20:38 +01:00

src/com/esotericsoftware/spine

Merge remote-tracking branch 'upstream/master'

2013-03-15 11:58:48 -06:00

test

Merge remote-tracking branch 'upstream/master'

2013-03-15 11:58:48 -06:00

.classpath

Added:

2013-03-14 22:32:25 -06:00

.project

Initial libgdx runtime.

2013-02-20 01:15:31 +01:00

spine-libgdx.iml

Added:

2013-03-14 22:32:25 -06:00

spine-libgdx.ipr

Added:

2013-03-14 22:32:25 -06:00

spine-libgdx.iws

Merge remote-tracking branch 'upstream/master'

2013-03-15 11:58:48 -06:00