Merge branch 'enhanced_viewport_overlay' into jgrpp

# Conflicts: # src/command.cpp # src/saveload/extended_ver_sl.cpp
2018-08-16 05:49:07 +01:00
parent f59535c0b7 98da7019d6
commit d8b9e2953e
10 changed files with 79 additions and 5 deletions
--- a/src/command_type.h
+++ b/src/command_type.h
@@ -398,6 +398,7 @@ enum Commands {
 	CMD_REMOVE_PLAN,
 	CMD_REMOVE_PLAN_LINE,
 	CMD_CHANGE_PLAN_VISIBILITY,
+	CMD_RENAME_PLAN,

 	CMD_DESYNC_CHECK,                 ///< Force desync checks to be run