Merge branch 'tracerestrict-sx' into jgrpp

This commit is contained in:
Jonathan G Rennison
2015-08-02 17:59:10 +01:00
31 changed files with 3335 additions and 1 deletions

View File

@@ -3048,6 +3048,18 @@
<ClCompile Include="..\src\thread\thread_win32.cpp">
<Filter>Threading</Filter>
</ClCompile>
<ClInclude Include="..\src\tracerestrict.h">
<Filter>Threading</Filter>
</ClInclude>
<ClCompile Include="..\src\tracerestrict.cpp">
<Filter>Threading</Filter>
</ClCompile>
<ClCompile Include="..\src\tracerestrict_gui.cpp">
<Filter>Threading</Filter>
</ClCompile>
<ClCompile Include="..\src\saveload\tracerestrict_sl.cpp">
<Filter>Threading</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\media\openttd.ico" />