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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/saveload/saveload.cpp
#	src/widgets/group_widget.h
This commit is contained in:
Jonathan G Rennison
2019-01-31 18:19:45 +00:00
parent c41463b259 23960d0f2c
commit ddf31702a2
24 changed files with 573 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/widgets/group_widget.h
View File

@@ -33,6 +33,7 @@ enum GroupListWidgets {
WID_GL_CREATE_GROUP, ///< Create group button.
WID_GL_DELETE_GROUP, ///< Delete group button.
WID_GL_RENAME_GROUP, ///< Rename group button.
WID_GL_LIVERY_GROUP, ///< Group livery button.
WID_GL_COLLAPSE_EXPAND_GROUP, ///< Collapse/expand group button.
WID_GL_COLLAPSE_ALL_GROUPS, ///< Collapse all groups button.
WID_GL_EXPAND_ALL_GROUPS, ///< Expand all groups button.