Merge branch 'master' into new-netcode

This commit is contained in:
Regalis
2017-01-25 20:30:26 +02:00
17 changed files with 966 additions and 136 deletions
+1 -1
View File
@@ -313,7 +313,7 @@
</Reference>
<Reference Include="NVorbis, Version=0.8.4.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>.\NVorbis.dll</HintPath>
<HintPath>..\packages\NVorbis.0.8.5.0\lib\NVorbis.dll</HintPath>
</Reference>
<Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>