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

1
src/window_type.h
View File

@@ -668,6 +668,7 @@ enum WindowClass {
* - 0 = #SpriteAlignerWidgets
*/
WC_SPRITE_ALIGNER,
WC_ZONING_TOOLBAR,
/**
* Linkgraph legend; %Window numbers: