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 21b49a213e Merge branch 'master' into jgrpp ... # Conflicts: # src/cheat_gui.cpp # src/main_gui.cpp # src/network/network_gui.cpp # src/saveload/saveload.h # src/smallmap_gui.cpp # src/station_cmd.cpp # src/timetable_cmd.cpp # src/toolbar_gui.cpp # src/widget.cpp # src/widget_type.h # src/widgets/dropdown_type.h		6 months ago
..
compat	Fix b0e73277: save/load next_station for CargoPacket again	8 months ago
CMakeLists.txt	Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/	12 months ago
afterload.cpp	Merge branch 'master' into jgrpp	6 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/	12 months ago
animated_tile_sl.cpp	Merge branch 'master' into jgrpp	11 months ago
autoreplace_sl.cpp	Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/	12 months ago
cargomonitor_sl.cpp	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 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	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
depot_sl.cpp	Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/	12 months 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: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
game_sl.cpp	Merge branch 'master' into jgrpp	6 months ago
gamelog_sl.cpp	Codechange: do not make a string valid in place, to then copy it	11 months ago
goal_sl.cpp	Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/	12 months ago
group_sl.cpp	Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/	12 months ago
industry_sl.cpp	Merge branch 'master' into jgrpp	6 months ago
labelmaps_sl.cpp	Codechange: Rename *Railtype* to *RailType* for consistency. (#11287)	9 months ago
league_sl.cpp	Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/	12 months ago
linkgraph_sl.cpp	Codechange: replace x.size() == 0 with x.empty()	7 months ago
map_sl.cpp	Codechange: make explicit when a TileIndex is cast to its basetype (#11190)	10 months ago
misc_sl.cpp	Codechange: Delete date_type.h	9 months ago
newgrf_sl.cpp	Change gamelog to use std::vector	11 months ago
newgrf_sl.h	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
object_sl.cpp	Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/	12 months ago
order_sl.cpp	Merge branch 'master' into jgrpp	9 months ago
saveload.cpp	Merge branch 'master' into jgrpp	6 months ago
saveload.h	Merge branch 'master' into jgrpp	6 months ago
settings_sl.cpp	Split save/load settings into separate INI files	7 months ago
signs_sl.cpp	Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/	12 months ago
station_sl.cpp	Merge branch 'master' into jgrpp	6 months ago
storage_sl.cpp	Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/	12 months ago
story_sl.cpp	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
subsidy_sl.cpp	Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/	12 months ago
town_sl.cpp	Merge branch 'master' into jgrpp	6 months ago
vehicle_sl.cpp	Codechange: simplify splitting of CargoPacket (#11286)	8 months ago