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

@@ -1273,6 +1273,10 @@
<ClCompile Include="..\src\os\windows\win32.cpp" />
<ClInclude Include="..\src\thread\thread.h" />
<ClCompile Include="..\src\thread\thread_win32.cpp" />
<ClInclude Include="..\src\tracerestrict.h" />
<ClCompile Include="..\src\tracerestrict.cpp" />
<ClCompile Include="..\src\tracerestrict_gui.cpp" />
<ClCompile Include="..\src\saveload\tracerestrict_sl.cpp" />
</ItemGroup>
<ItemGroup>
<None Include="..\media\openttd.ico" />

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" />

View File

@@ -4490,6 +4490,22 @@
RelativePath=".\..\src\thread\thread_win32.cpp"
>
</File>
<File
RelativePath=".\..\src\tracerestrict.h"
>
</File>
<File
RelativePath=".\..\src\tracerestrict.cpp"
>
</File>
<File
RelativePath=".\..\src\tracerestrict_gui.cpp"
>
</File>
<File
RelativePath=".\..\src\saveload\tracerestrict_sl.cpp"
>
</File>
</Filter>
<File
RelativePath=".\..\media\openttd.ico"

View File

@@ -4487,6 +4487,22 @@
RelativePath=".\..\src\thread\thread_win32.cpp"
>
</File>
<File
RelativePath=".\..\src\tracerestrict.h"
>
</File>
<File
RelativePath=".\..\src\tracerestrict.cpp"
>
</File>
<File
RelativePath=".\..\src\tracerestrict_gui.cpp"
>
</File>
<File
RelativePath=".\..\src\saveload\tracerestrict_sl.cpp"
>
</File>
</Filter>
<File
RelativePath=".\..\media\openttd.ico"