Merge branch 'master' into cpp-11

2019-01-13 22:49:55 +00:00
parent 962a9c5430 823c5bfa3b
commit 0bed63b77f
143 changed files with 1012 additions and 320 deletions
--- a/source.list
+++ b/source.list
@@ -210,6 +210,7 @@ group.h
 group_gui.h
 group_type.h
 gui.h
+guitimer_func.h
 heightmap.h
 highscore.h
 hotkeys.h