Merge branch 'enhanced_viewport_overlay' into jgrpp

# Conflicts:
#	src/command.cpp
#	src/saveload/extended_ver_sl.cpp
This commit is contained in:
Jonathan G Rennison
2018-08-16 05:49:07 +01:00
10 changed files with 79 additions and 5 deletions

View File

@@ -24,6 +24,7 @@ enum PlansWidgets {
WID_PLN_SHOW_ALL,
WID_PLN_DELETE,
WID_PLN_HIDE_ALL_SEL,
WID_PLN_RENAME,
};
#endif /* WIDGETS_PLANS_WIDGET_H */