Merge remote-tracking branch 'origin/master'

This commit is contained in:
NathanSweet 2014-10-01 00:41:37 +02:00
commit ab6e07765c

View File

@ -69,6 +69,8 @@
<Compile Include="src\AnimationState.cs" />
<Compile Include="src\Event.cs" />
<Compile Include="src\EventData.cs" />
<Compile Include="src\IkConstraint.cs" />
<Compile Include="src\IkConstraintData.cs" />
<Compile Include="src\Json.cs" />
<Compile Include="src\Skeleton.cs" />
<Compile Include="src\SkeletonData.cs" />