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/source.list
+++ b/source.list
@@ -483,7 +483,6 @@ core/smallmap_type.hpp
 core/smallmatrix_type.hpp
 core/smallstack_type.hpp
 core/smallvec_type.hpp
-core/sort_func.hpp
 core/string_compare_type.hpp

 # GUI Source Code