Import and rebase zoning patch

Fix some of the whitespace issues

http://www.tt-forums.net/viewtopic.php?p=888801#p888801
This commit is contained in:
patch-import
2015-08-02 10:57:53 +01:00
committed by Jonathan G Rennison
parent 67366cf03d
commit 6de087786c
16 changed files with 626 additions and 1 deletions

View File

@@ -660,6 +660,7 @@
<ClInclude Include="..\src\window_type.h" />
<ClInclude Include="..\src\zoom_func.h" />
<ClInclude Include="..\src\zoom_type.h" />
<ClInclude Include="..\src\zoning.h" />
<ClCompile Include="..\src\core\alloc_func.cpp" />
<ClInclude Include="..\src\core\alloc_func.hpp" />
<ClInclude Include="..\src\core\alloc_type.hpp" />
@@ -745,6 +746,7 @@
<ClCompile Include="..\src\vehicle_gui.cpp" />
<ClCompile Include="..\src\viewport_gui.cpp" />
<ClCompile Include="..\src\waypoint_gui.cpp" />
<ClCompile Include="..\src\zoning_gui.cpp" />
<ClInclude Include="..\src\widgets\airport_widget.h" />
<ClInclude Include="..\src\widgets\ai_widget.h" />
<ClInclude Include="..\src\widgets\autoreplace_widget.h" />
@@ -828,6 +830,7 @@
<ClCompile Include="..\src\void_cmd.cpp" />
<ClCompile Include="..\src\water_cmd.cpp" />
<ClCompile Include="..\src\waypoint_cmd.cpp" />
<ClCompile Include="..\src\zoning_cmd.cpp" />
<ClCompile Include="..\src\saveload\afterload.cpp" />
<ClCompile Include="..\src\saveload\ai_sl.cpp" />
<ClCompile Include="..\src\saveload\airport_sl.cpp" />

View File

@@ -1209,6 +1209,9 @@
<ClInclude Include="..\src\zoom_type.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\zoning.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClCompile Include="..\src\core\alloc_func.cpp">
<Filter>Core Source Code</Filter>
</ClCompile>
@@ -1464,6 +1467,9 @@
<ClCompile Include="..\src\waypoint_gui.cpp">
<Filter>GUI Source Code</Filter>
</ClCompile>
<ClCompile Include="..\src\zoning_gui.cpp">
<Filter>GUI Source Code</Filter>
</ClCompile>
<ClInclude Include="..\src\widgets\airport_widget.h">
<Filter>Widgets</Filter>
</ClInclude>
@@ -1713,6 +1719,9 @@
<ClCompile Include="..\src\waypoint_cmd.cpp">
<Filter>Command handlers</Filter>
</ClCompile>
<ClCompile Include="..\src\zoning_cmd.cpp">
<Filter>Command handlers</Filter>
</ClCompile>
<ClCompile Include="..\src\saveload\afterload.cpp">
<Filter>Save/Load handlers</Filter>
</ClCompile>

View File

@@ -1914,6 +1914,10 @@
RelativePath=".\..\src\zoom_type.h"
>
</File>
<File
RelativePath=".\..\src\zoning.h"
>
</File>
</Filter>
<Filter
Name="Core Source Code"
@@ -2262,6 +2266,10 @@
RelativePath=".\..\src\waypoint_gui.cpp"
>
</File>
<File
RelativePath=".\..\src\zoning_gui.cpp"
>
</File>
</Filter>
<Filter
Name="Widgets"
@@ -2602,6 +2610,10 @@
RelativePath=".\..\src\waypoint_cmd.cpp"
>
</File>
<File
RelativePath=".\..\src\zoning_cmd.cpp"
>
</File>
</Filter>
<Filter
Name="Save/Load handlers"

View File

@@ -1911,6 +1911,10 @@
RelativePath=".\..\src\zoom_type.h"
>
</File>
<File
RelativePath=".\..\src\zoning.h"
>
</File>
</Filter>
<Filter
Name="Core Source Code"
@@ -2259,6 +2263,10 @@
RelativePath=".\..\src\waypoint_gui.cpp"
>
</File>
<File
RelativePath=".\..\src\zoning_gui.cpp"
>
</File>
</Filter>
<Filter
Name="Widgets"
@@ -2599,6 +2607,10 @@
RelativePath=".\..\src\waypoint_cmd.cpp"
>
</File>
<File
RelativePath=".\..\src\zoning_cmd.cpp"
>
</File>
</Filter>
<Filter
Name="Save/Load handlers"