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.
*AnimationState.java
*AnimationStateTest.java
Updated:
*Git ignore to ignore all LibGDX libs.
*MixTest.Java -- Reverted back to LWJGL
*SkeletonTest.java -- Reverted back to LWJGL
A few Idea project files where added. I left these in for easy future development with
Intellij Idea.