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

12
projects/openttd_vs80.vcproj
View File

@@ -1926,6 +1926,10 @@
RelativePath=".\..\src\zoom_type.h"
>
</File>
<File
RelativePath=".\..\src\zoning.h"
>
</File>
</Filter>
<Filter
Name="Core Source Code"
@@ -2274,6 +2278,10 @@
RelativePath=".\..\src\waypoint_gui.cpp"
>
</File>
<File
RelativePath=".\..\src\zoning_gui.cpp"
>
</File>
</Filter>
<Filter
Name="Widgets"
@@ -2614,6 +2622,10 @@
RelativePath=".\..\src\waypoint_cmd.cpp"
>
</File>
<File
RelativePath=".\..\src\zoning_cmd.cpp"
>
</File>
</Filter>
<Filter
Name="Save/Load handlers"