Jonathan G Rennison
6c3e5642f8
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/CompileFlags.cmake
# src/crashlog.cpp
# src/fileio.cpp
# src/fileio_func.h
# src/fios_gui.cpp
# src/ini_load.cpp
# src/ini_type.h
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/network/network_client.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/os/windows/win32.cpp
# src/road_cmd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/settings.cpp
# src/station_cmd.cpp
# src/stdafx.h
# src/table/settings.ini
# src/tree_cmd.cpp
# src/tree_gui.cpp
# src/vehicle_base.h
# src/video/cocoa/cocoa_v.mm
# src/video/cocoa/event.mm
# src/video/cocoa/wnd_quartz.mm
# src/viewport.cpp
# src/widgets/tree_widget.h
2021-01-31 01:08:35 +00:00
..
2020-06-05 19:36:05 +02:00
2019-11-10 17:59:20 +00:00
2019-11-10 17:59:20 +00:00
2019-11-12 18:43:10 +00:00
2020-02-14 21:43:21 +01:00
2019-11-10 17:59:20 +00:00
2020-10-17 17:25:44 +01:00
2019-11-10 17:59:20 +00:00
2020-12-25 19:38:18 +01:00
2019-11-10 17:59:20 +00:00
2020-12-27 13:19:25 +01:00
2020-05-21 20:02:34 +02:00
2019-11-10 17:59:20 +00:00