Jonathan G Rennison
ba34ec7ade
Merge branch 'master' into jgrpp
Replace build and refit, and group collapse implementations
Fix template creation build and refit
# Conflicts:
# Makefile.bundle.in
# config.lib
# src/animated_tile.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.hpp
# src/blitter/null.hpp
# src/build_vehicle_gui.cpp
# src/command.cpp
# src/command_func.h
# src/console_gui.cpp
# src/core/smallstack_type.hpp
# src/date.cpp
# src/debug.cpp
# src/genworld_gui.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/core/game.h
# src/network/core/packet.cpp
# src/network/core/udp.cpp
# src/network/core/udp.h
# src/network/network_content.cpp
# src/network/network_type.h
# src/network/network_udp.cpp
# src/newgrf_house.h
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/osk_gui.cpp
# src/pathfinder/opf/opf_ship.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.h
# src/station_base.h
# src/station_cmd.cpp
# src/table/gameopt_settings.ini
# src/table/newgrf_debug_data.h
# src/table/settings.ini
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/viewport.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
2019-03-27 18:12:04 +00:00
..
2019-01-25 22:28:39 +00:00
2019-01-25 22:28:39 +00:00
2019-01-25 22:28:39 +00:00
2019-01-25 22:28:39 +00:00
2019-01-25 22:28:39 +00:00
2019-01-25 22:28:39 +00:00
2019-01-25 22:28:39 +00:00
2019-01-25 22:28:39 +00:00
2019-01-26 14:56:35 +01:00
2019-01-26 14:56:35 +01:00
2019-01-26 14:56:35 +01:00
2019-01-26 14:56:35 +01:00
2019-03-04 01:18:25 +00:00
2019-01-25 16:59:41 +01:00
2017-08-24 14:50:55 +00:00
2019-03-11 10:16:00 +01:00
2019-01-17 23:02:11 +00:00
2019-01-17 23:02:11 +00:00
2019-01-26 14:56:35 +01:00
2019-03-11 10:16:00 +01:00
2018-04-29 21:30:45 +02:00
2018-04-29 21:30:45 +02:00
2015-08-10 20:36:57 +00:00
2017-09-24 17:38:03 +00:00
2018-04-29 21:30:45 +02:00
2018-04-29 21:30:45 +02:00
2017-09-24 16:19:29 +00:00
2017-09-24 17:38:03 +00:00
2019-01-26 14:56:35 +01:00
2019-01-26 14:56:35 +01:00
2019-01-26 14:56:35 +01:00
2019-01-26 14:56:35 +01:00
2019-01-06 22:10:04 +00:00
2019-01-06 22:10:04 +00:00
2019-01-06 22:10:04 +00:00
2019-01-06 22:10:04 +00:00
2019-01-25 22:28:39 +00:00
2019-03-27 18:12:04 +00:00
2019-03-27 18:12:04 +00:00
2018-04-21 11:05:38 +02:00
2019-03-11 10:16:00 +01:00
2019-01-25 22:28:39 +00:00
2019-03-27 18:12:04 +00:00
2019-03-27 18:12:04 +00:00
2018-04-21 11:05:38 +02:00
2019-03-11 10:16:00 +01:00
2019-01-29 17:18:12 +01:00
2019-03-27 18:12:04 +00:00
2019-03-27 18:12:04 +00:00
2019-01-26 14:56:35 +01:00
2019-03-11 10:16:00 +01:00
2019-01-25 16:59:41 +01:00
2019-01-05 18:10:14 +01:00
2019-01-05 18:10:14 +01:00
2019-01-26 14:56:35 +01:00
2019-01-05 18:10:14 +01:00
2019-01-17 23:02:11 +00:00
2015-08-10 20:36:57 +00:00
2015-08-10 20:36:57 +00:00
2019-01-17 23:02:11 +00:00
2019-01-17 23:02:11 +00:00
2017-09-24 16:19:29 +00:00
2017-09-24 16:19:29 +00:00
2019-01-17 23:02:11 +00:00
2019-01-26 14:56:35 +01:00
2019-01-26 14:56:35 +01:00
2019-01-26 14:56:35 +01:00
2019-01-26 14:56:35 +01:00
2018-11-18 19:51:51 +01:00
2015-08-10 20:36:57 +00:00
2017-09-24 16:19:29 +00:00
2017-09-24 16:19:29 +00:00
2019-01-26 14:56:35 +01:00
2019-01-26 14:56:35 +01:00
2018-11-18 19:51:51 +01:00
2015-08-10 20:36:57 +00:00
2017-09-24 16:19:29 +00:00
2017-09-24 16:19:29 +00:00
2019-01-26 14:56:35 +01:00
2019-01-26 14:56:35 +01:00
2018-11-18 19:51:51 +01:00
2017-09-24 16:19:29 +00:00
2019-01-26 14:56:35 +01:00