Merge branch 'origin/master'

This commit is contained in:
NathanSweet 2013-09-23 20:36:01 +02:00
commit 45f8e9d790
2 changed files with 12 additions and 0 deletions

View File

@ -162,6 +162,12 @@
<Compile Include="..\..\..\spine-csharp\src\BoneData.cs">
<Link>spine-csharp\BoneData.cs</Link>
</Compile>
<Compile Include="..\..\..\spine-csharp\src\Event.cs">
<Link>spine-csharp\Event.cs</Link>
</Compile>
<Compile Include="..\..\..\spine-csharp\src\EventData.cs">
<Link>spine-csharp\EventData.cs</Link>
</Compile>
<Compile Include="..\..\..\spine-csharp\src\Json.cs">
<Link>spine-csharp\Json.cs</Link>
</Compile>

View File

@ -122,5 +122,11 @@
<Compile Include="..\..\..\spine-xna\src\XnaTextureLoader.cs">
<Link>spine-xna\XnaTextureLoader.cs</Link>
</Compile>
<Compile Include="..\..\..\spine-csharp\src\Event.cs">
<Link>spine-csharp\Event.cs</Link>
</Compile>
<Compile Include="..\..\..\spine-csharp\src\EventData.cs">
<Link>spine-csharp\EventData.cs</Link>
</Compile>
</ItemGroup>
</Project>