Jonathan G Rennison
55d78a23be
Merge branch 'master' into jgrpp
# Conflicts:
# src/3rdparty/squirrel/include/squirrel.h
# src/blitter/32bpp_sse_func.hpp
# src/bridge_map.h
# src/clear_map.h
# src/company_manager_face.h
# src/console_func.h
# src/core/bitmath_func.hpp
# src/core/endian_func.hpp
# src/core/random_func.hpp
# src/depot_map.h
# src/elrail_func.h
# src/fontcache.h
# src/industry_map.h
# src/map_func.h
# src/newgrf_spritegroup.h
# src/object_map.h
# src/rail.h
# src/rail_map.h
# src/road_func.h
# src/road_map.h
# src/saveload/saveload.h
# src/saveload/saveload_error.hpp
# src/settings_gui.cpp
# src/sl/oldloader.h
# src/sprite.h
# src/spritecache.h
# src/station_func.h
# src/station_map.h
# src/story_base.h
# src/strings_func.h
# src/tile_cmd.h
# src/tile_map.h
# src/tile_type.h
# src/town.h
# src/town_map.h
# src/tree_map.h
# src/tunnel_map.h
# src/tunnelbridge_map.h
# src/vehicle_func.h
# src/viewport_func.h
# src/void_map.h
# src/water.h
# src/water_map.h
# src/widget_type.h
2024-01-07 15:00:16 +00:00
..
2024-01-07 15:00:16 +00:00
2023-08-28 19:58:17 +01:00
2023-12-19 02:39:54 +00:00
2023-07-19 19:30:14 +02:00
2023-09-10 08:40:25 -04:00
2024-01-05 21:12:54 +00:00
2023-12-19 17:55:57 +00:00
2023-07-19 19:30:14 +02:00
2024-01-04 16:23:54 +01:00
2024-01-05 21:12:54 +00:00
2024-01-02 14:44:33 +00:00
2024-01-02 22:05:25 +01:00
2024-01-02 22:05:25 +01:00
2023-11-25 13:30:06 +00:00
2023-07-19 19:30:14 +02:00
2023-11-20 22:27:05 +00:00
2023-05-19 11:24:44 +02:00
2023-09-02 19:46:52 +02:00
2024-01-05 13:37:52 +00:00
2023-11-25 13:30:06 +00:00
2023-11-13 23:44:36 +00:00
2023-11-20 22:27:05 +00:00
2023-07-03 23:44:54 +01:00
2024-01-05 22:11:28 +00:00
2023-11-20 22:27:05 +00:00
2023-07-19 19:30:14 +02:00
2023-07-19 19:30:14 +02:00
2024-01-05 22:35:20 +00:00
2024-01-05 22:11:28 +00:00
2023-08-28 19:58:17 +01:00
2023-11-20 22:27:05 +00:00
2023-07-19 19:30:14 +02:00
2023-07-19 19:30:14 +02:00
2023-11-20 22:27:05 +00:00
2021-07-10 20:17:07 +02:00
2024-01-05 21:12:54 +00:00
2019-11-12 18:43:10 +00:00