Merge branch 'origin/master'

This commit is contained in:
NathanSweet 2013-09-22 10:52:29 +02:00
commit a16bb5b5d6
2 changed files with 14 additions and 2 deletions

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
@ -147,6 +147,9 @@
<Compile Include="..\..\..\spine-csharp\src\Attachments\AttachmentLoader.cs"> <Compile Include="..\..\..\spine-csharp\src\Attachments\AttachmentLoader.cs">
<Link>spine-csharp\Attachments\AttachmentLoader.cs</Link> <Link>spine-csharp\Attachments\AttachmentLoader.cs</Link>
</Compile> </Compile>
<Compile Include="..\..\..\spine-csharp\src\Attachments\BoundingBoxAttachment.cs">
<Link>spine-csharp\Attachments\BoundingBoxAttachment.cs</Link>
</Compile>
<Compile Include="..\..\..\spine-csharp\src\Attachments\AttachmentType.cs"> <Compile Include="..\..\..\spine-csharp\src\Attachments\AttachmentType.cs">
<Link>spine-csharp\Attachments\AttachmentType.cs</Link> <Link>spine-csharp\Attachments\AttachmentType.cs</Link>
</Compile> </Compile>
@ -165,6 +168,9 @@
<Compile Include="..\..\..\spine-csharp\src\Skeleton.cs"> <Compile Include="..\..\..\spine-csharp\src\Skeleton.cs">
<Link>spine-csharp\Skeleton.cs</Link> <Link>spine-csharp\Skeleton.cs</Link>
</Compile> </Compile>
<Compile Include="..\..\..\spine-csharp\src\SkeletonBounds.cs">
<Link>spine-csharp\SkeletonBounds.cs</Link>
</Compile>
<Compile Include="..\..\..\spine-csharp\src\SkeletonData.cs"> <Compile Include="..\..\..\spine-csharp\src\SkeletonData.cs">
<Link>spine-csharp\SkeletonData.cs</Link> <Link>spine-csharp\SkeletonData.cs</Link>
</Compile> </Compile>
@ -205,4 +211,4 @@
<Target Name="AfterBuild"> <Target Name="AfterBuild">
</Target> </Target>
--> -->
</Project> </Project>

View File

@ -59,6 +59,9 @@
<Compile Include="..\..\..\spine-csharp\src\Attachments\AttachmentLoader.cs"> <Compile Include="..\..\..\spine-csharp\src\Attachments\AttachmentLoader.cs">
<Link>spine-csharp\Attachments\AttachmentLoader.cs</Link> <Link>spine-csharp\Attachments\AttachmentLoader.cs</Link>
</Compile> </Compile>
<Compile Include="..\..\..\spine-csharp\src\Attachments\BoundingBoxAttachment.cs">
<Link>spine-csharp\Attachments\BoundingBoxAttachment.cs</Link>
</Compile>
<Compile Include="..\..\..\spine-csharp\src\Attachments\AttachmentType.cs"> <Compile Include="..\..\..\spine-csharp\src\Attachments\AttachmentType.cs">
<Link>spine-csharp\Attachments\AttachmentType.cs</Link> <Link>spine-csharp\Attachments\AttachmentType.cs</Link>
</Compile> </Compile>
@ -89,6 +92,9 @@
<Compile Include="..\..\..\spine-csharp\src\Skeleton.cs"> <Compile Include="..\..\..\spine-csharp\src\Skeleton.cs">
<Link>spine-csharp\Skeleton.cs</Link> <Link>spine-csharp\Skeleton.cs</Link>
</Compile> </Compile>
<Compile Include="..\..\..\spine-csharp\src\SkeletonBounds.cs">
<Link>spine-csharp\SkeletonBounds.cs</Link>
</Compile>
<Compile Include="..\..\..\spine-csharp\src\SkeletonData.cs"> <Compile Include="..\..\..\spine-csharp\src\SkeletonData.cs">
<Link>spine-csharp\SkeletonData.cs</Link> <Link>spine-csharp\SkeletonData.cs</Link>
</Compile> </Compile>