You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Jonathan G Rennison 5ae74ecf8e Merge branch 'master' into jgrpp ... # Conflicts: # src/articulated_vehicles.cpp # src/articulated_vehicles.h # src/autoreplace_cmd.cpp # src/build_vehicle_gui.cpp # src/company_gui.cpp # src/core/format.hpp # src/genworld_gui.cpp # src/gfx.cpp # src/group_gui.cpp # src/linkgraph/linkgraph_gui.cpp # src/misc/endian_buffer.hpp # src/music/music_driver.hpp # src/newgrf_gui.cpp # src/rail_cmd.cpp # src/road_gui.cpp # src/settings_type.h # src/strgen/strgen.cpp # src/strings.cpp # src/timetable_cmd.cpp # src/town.h # src/vehicle.cpp # src/vehicle_gui.cpp # src/vehicle_gui_base.h # src/widget.cpp # src/widgets/dropdown.cpp # src/widgets/road_widget.h		6 months ago
..
CMakeLists.txt	Change: base autosaves intervals on real time (instead of game time) (#10655)	7 months ago
timer.h	…
timer_game_realtime.cpp	Change: base autosaves intervals on real time (instead of game time) (#10655)	7 months ago
timer_game_realtime.h	Change: base autosaves intervals on real time (instead of game time) (#10655)	7 months ago
timer_game_tick.cpp	Merge branch 'master' into jgrpp	6 months ago
timer_game_tick.h	Merge branch 'master' into jgrpp	6 months ago
timer_manager.h	Merge branch 'master' into jgrpp	6 months ago