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 fdd666f66a Merge tag '14.0-beta1' into jgrpp ... # Conflicts: # src/3rdparty/squirrel/squirrel/sqcompiler.cpp # src/aircraft.h # src/animated_tile.h # src/base_consist.h # src/cargotype.h # src/company_gui.cpp # src/console_cmds.cpp # src/core/overflowsafe_type.hpp # src/engine_gui.cpp # src/industry_gui.cpp # src/lang/english.txt # src/music/extmidi.cpp # src/network/core/network_game_info.cpp # src/network/network_server.cpp # src/newgrf.cpp # src/newgrf_industries.cpp # src/order_base.h # src/order_cmd.cpp # src/order_gui.cpp # src/order_type.h # src/os/macosx/misc_osx.cpp # src/os/windows/crashlog_win.cpp # src/rail_gui.cpp # src/rail_gui.h # src/roadveh.h # src/roadveh_cmd.cpp # src/saveload/afterload.cpp # src/saveload/company_sl.cpp # src/saveload/saveload.cpp # src/saveload/saveload.h # src/saveload/saveload_error.hpp # src/script/api/script_town.cpp # src/settingsgen/settingsgen.cpp # src/ship.h # src/ship_cmd.cpp # src/smallmap_gui.cpp # src/spritecache.cpp # src/stdafx.h # src/strgen/strgen.cpp # src/strgen/strgen.h # src/table/settings/script_settings.ini # src/timetable_cmd.cpp # src/timetable_gui.cpp # src/town.h # src/town_cmd.cpp # src/town_cmd.h # src/town_gui.cpp # src/train.h # src/train_cmd.cpp # src/tree_cmd.cpp # src/vehicle.cpp # src/vehicle_base.h # src/vehicle_cmd.cpp # src/vehicle_gui.cpp # src/vehiclelist.cpp # src/waypoint_base.h # src/widget.cpp		4 months ago
..
compat	Merge tag '14.0-beta1' into jgrpp	4 months ago
CMakeLists.txt	Merge branch 'master' into jgrpp	5 months ago
afterload.cpp	Merge tag '14.0-beta1' 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	Merge tag '14.0-beta1' into jgrpp	4 months ago
saveload.h	Feature: Order flag to unbunch vehicles at depot (#11945)	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	Merge tag '14.0-beta1' into jgrpp	4 months ago
vehicle_sl.cpp	Merge tag '14.0-beta1' into jgrpp	4 months ago
water_regions_sl.cpp	Merge branch 'master' into jgrpp	4 months ago