Merge branch 'master' into jgrpp

# Conflicts: # src/core/sort_func.hpp # src/rail_cmd.cpp # src/timetable_cmd.cpp # src/video/sdl_v.cpp # src/video/win32_v.cpp
2019-04-23 08:11:52 +01:00
parent da2528cbe2 66cd32a252
commit bd2fdde759
44 changed files with 210 additions and 285 deletions
--- a/src/schdispatch_cmd.cpp
+++ b/src/schdispatch_cmd.cpp
@@ -19,7 +19,6 @@
 #include "settings_type.h"
 #include "cmd_helper.h"
 #include "company_base.h"
-#include "core/sort_func.hpp"
 #include "settings_type.h"
 #include "schdispatch.h"
 #include "vehicle_gui.h"