Merge branch 'jgrpp' into jgrpp-nrt

# Conflicts: # .ottdrev-vc # README.md # jgrpp-changelog.md
2019-08-29 01:01:45 +01:00
parent f825d4695e df2c6d48a8
commit ba9d1a0390
17 changed files with 104 additions and 18 deletions
--- a/source.list
+++ b/source.list
@@ -180,6 +180,7 @@ date_func.h
 date_gui.h
 date_type.h
 debug.h
+debug_settings.h
 video/dedicated_v.h
 departures_func.h
 departures_gui.h