Jonathan G Rennison
822ecae85d
Merge branch 'master' into jgrpp
# Conflicts:
# src/cargotype.h
# src/core/CMakeLists.txt
# src/core/span_type.hpp
# src/fileio.cpp
# src/fios.cpp
# src/misc/endian_buffer.hpp
# src/misc_gui.cpp
# src/saveload/saveload.h
# src/saveload/vehicle_sl.cpp
# src/screenshot.cpp
# src/settings.cpp
# src/settings_internal.h
# src/stdafx.h
# src/string_func.h
# src/strings.cpp
# src/strings_func.h
# src/strings_internal.h
2024-01-25 18:37:23 +00:00
..
2023-04-25 17:55:09 +02:00
2024-01-25 18:37:23 +00:00
2024-01-07 17:20:41 +00:00
2023-09-04 00:04:54 +01:00