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 838b166726 Merge branch 'master' into jgrpp ... # Conflicts: # src/cheat_gui.cpp # src/command.cpp # src/command_func.h # src/company_base.h # src/debug.cpp # src/debug.h # src/economy.cpp # src/engine_type.h # src/graph_gui.cpp # src/misc_cmd.cpp # src/misc_cmd.h # src/network/core/os_abstraction.cpp # src/openttd.cpp # src/saveload/saveload.cpp # src/saveload/saveload.h # src/settings_type.h # src/ship_cmd.cpp # src/stdafx.h # src/tests/bitmath_func.cpp # src/town_cmd.cpp # src/town_gui.cpp		4 months ago
..
compat	Fix b0e73277: save/load next_station for CargoPacket again	8 months ago
CMakeLists.txt	Merge branch 'master' into jgrpp	5 months ago
afterload.cpp	Merge branch 'master' into jgrpp	4 months ago
ai_sl.cpp	Merge branch 'master' into jgrpp	11 months ago
airport_sl.cpp	Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/	1 year ago
animated_tile_sl.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
autoreplace_sl.cpp	Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/	1 year ago
cargomonitor_sl.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
cargopacket_sl.cpp	Codechange: Use iterators and/or range-for on cargo related loops.	8 months ago
cheat_sl.cpp	Merge branch 'master' into jgrpp	6 months ago
company_sl.cpp	Merge branch 'master' into jgrpp	4 months ago
depot_sl.cpp	Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/	1 year ago
economy_sl.cpp	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
engine_sl.cpp	Codechange: coding style fixes	5 months ago
game_sl.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
gamelog_sl.cpp	Use upstream/table format for game log chunk	4 months ago
goal_sl.cpp	Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/	1 year ago
group_sl.cpp	Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/	1 year ago
industry_sl.cpp	Split date types into calendar and economy dates	4 months ago
labelmaps_sl.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
league_sl.cpp	Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/	1 year ago
linkgraph_sl.cpp	Change link graph join and compression times to use scaled tick counter	4 months ago
map_sl.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
misc_sl.cpp	Split date types into calendar and economy dates	4 months ago
newgrf_sl.cpp	Change gamelog to use std::vector	11 months ago
newgrf_sl.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
object_sl.cpp	Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/	1 year ago
order_sl.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
saveload.cpp	Fix: Use alternate timekeeping units in savegame title (#11912)	4 months ago
saveload.h	Add: [GS] Allow to set max loan for each company separately (#11224)	4 months ago
settings_sl.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
signs_sl.cpp	Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/	1 year ago
station_sl.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
storage_sl.cpp	Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/	1 year ago
story_sl.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
subsidy_sl.cpp	Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/	1 year ago
town_sl.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
vehicle_sl.cpp	Use DateTicksScaled for Vehicle::last_loading_tick	4 months ago
water_regions_sl.cpp	Merge branch 'master' into jgrpp	4 months ago