Merge branch 'save_ext' into jgrpp

# Conflicts: # config.lib # src/misc_gui.cpp # src/network/network_gui.cpp # src/settings_type.h # src/smallmap_gui.cpp # src/smallmap_gui.h # src/station_cmd.cpp # src/toolbar_gui.cpp # src/vehicle_gui.cpp # src/window.cpp
2019-01-14 00:01:44 +00:00
parent 7e5455a07d 4a162c5502
commit e3d167f9f0
147 changed files with 1026 additions and 330 deletions
--- a/source.list
+++ b/source.list
@@ -230,6 +230,7 @@ group.h
 group_gui.h
 group_type.h
 gui.h
+guitimer_func.h
 heightmap.h
 highscore.h
 hotkeys.h