dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'zoning' into jgrpp

Browse Source 
Conflicts:
	src/table/sprites.h
This commit is contained in:
Jonathan G Rennison
2015-08-02 18:20:23 +01:00
parent 0afc054bff 74bccb5d50
commit 6596ba216c
16 changed files with 640 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
projects/openttd_vs100.vcxproj.filters
View File

@@ -1218,6 +1218,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>
@@ -1473,6 +1476,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>
@@ -1722,6 +1728,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>