Merge remote-tracking branch 'origin/master' into sdl2

This commit is contained in:
Stefanos A 2013-09-27 15:20:45 +02:00
commit 0fdef8eb23

View file

@ -108,6 +108,9 @@
<PropertyGroup> <PropertyGroup>
<AssemblyOriginatorKeyFile>..\..\OpenTK.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>..\..\OpenTK.snk</AssemblyOriginatorKeyFile>
</PropertyGroup> </PropertyGroup>
<PropertyGroup>
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System"> <Reference Include="System">
<Name>System</Name> <Name>System</Name>
@ -484,6 +487,7 @@
<None Include="..\..\OpenTK.snk"> <None Include="..\..\OpenTK.snk">
<Link>OpenTK.snk</Link> <Link>OpenTK.snk</Link>
</None> </None>
<None Include="app.manifest" />
<None Include="Data\Poem.txt"> <None Include="Data\Poem.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>