Jonathan G Rennison
2bd535e834
Merge branch 'master' into jgrpp-beta
# Conflicts:
# src/engine_base.h
# src/gfxinit.cpp
# src/graph_gui.cpp
# src/lang/brazilian_portuguese.txt
# src/lang/dutch.txt
# src/lang/french.txt
# src/lang/korean.txt
# src/lang/norwegian_bokmal.txt
# src/lang/portuguese.txt
# src/lang/russian.txt
# src/lang/spanish.txt
# src/lang/spanish_MX.txt
# src/network/core/address.cpp
# src/network/core/game_info.h
# src/network/core/os_abstraction.h
# src/network/core/udp.cpp
# src/network/network_client.cpp
# src/network/network_client.h
# src/network/network_internal.h
# src/newgrf_engine.cpp
# src/settings_gui.cpp
# src/station_cmd.cpp
# src/string_func.h
# src/town_gui.cpp
# src/video/video_driver.cpp
# src/widget_type.h
2021-09-18 01:28:57 +01:00
..
2020-12-27 10:55:42 +00:00
2020-12-27 10:55:42 +00:00
2021-02-20 19:01:04 +01:00
2020-12-21 23:12:58 +01:00
2021-03-04 18:50:29 +00:00
2021-08-29 02:11:58 +01:00
2021-06-14 22:55:26 +01:00
2021-05-03 21:59:49 +01:00
2021-02-20 19:01:04 +01:00
2021-04-25 01:23:52 +01:00
2021-02-13 19:18:41 +01:00
2021-06-14 00:52:46 +01:00
2021-09-04 21:40:26 +01:00
2021-02-24 22:10:25 +01:00
2020-12-27 10:55:42 +00:00
2021-08-28 12:54:18 +01:00
2021-03-11 00:21:09 +01:00
2020-10-16 22:12:10 +01:00
2021-05-03 21:59:49 +01:00
2021-09-18 01:28:57 +01:00
2021-09-04 11:39:54 +01:00
2021-05-21 18:29:45 +01:00
2021-06-14 22:55:26 +01:00
2020-12-27 10:55:42 +00:00
2021-01-29 17:45:15 +00:00
2020-12-27 10:55:42 +00:00
2021-03-02 13:46:42 +00:00
2021-03-02 13:46:42 +00:00