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 0d93ecb6bf Merge branch 'master' into jgrpp ... # Conflicts: # src/core/alloc_type.hpp # src/group_gui.cpp # src/newgrf.cpp # src/saveload/economy_sl.cpp # src/saveload/map_sl.cpp # src/station_cmd.cpp		5 years ago
..
afterload.cpp	Merge: Codechange: Use null pointer literal instead of the NULL macro	5 years ago
ai_sl.cpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
airport_sl.cpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
animated_tile_sl.cpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
autoreplace_sl.cpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
bridge_signal_sl.cpp	Merge: Codechange: Use null pointer literal instead of the NULL macro	5 years ago
cargomonitor_sl.cpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
cargopacket_sl.cpp	Merge: Codechange: Use null pointer literal instead of the NULL macro	5 years ago
cheat_sl.cpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
company_sl.cpp	Merge: Codechange: Use null pointer literal instead of the NULL macro	5 years ago
depot_sl.cpp	Merge: Codechange: Use null pointer literal instead of the NULL macro	5 years ago
economy_sl.cpp	Merge branch 'master' into jgrpp	5 years ago
engine_sl.cpp	Cleanup: Fix alignment after NULL -> nullptr change.	5 years ago
extended_ver_sl.cpp	Merge: Codechange: Use null pointer literal instead of the NULL macro	5 years ago
extended_ver_sl.h	Merge: Codechange: Use null pointer literal instead of the NULL macro	5 years ago
game_sl.cpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
gamelog_sl.cpp	Merge: Codechange: Use null pointer literal instead of the NULL macro	5 years ago
goal_sl.cpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
group_sl.cpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
industry_sl.cpp	Cleanup: Fix alignment after NULL -> nullptr change.	5 years ago
labelmaps_sl.cpp	Merge: Codechange: Use null pointer literal instead of the NULL macro	5 years ago
linkgraph_sl.cpp	Merge branch 'master' into jgrpp	5 years ago
map_sl.cpp	Merge branch 'master' into jgrpp	5 years ago
misc_sl.cpp	Merge branch 'master' into jgrpp	5 years ago
newgrf_sl.cpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
newgrf_sl.h	…
object_sl.cpp	Cleanup: Fix alignment after NULL -> nullptr change.	5 years ago
oldloader.cpp	Merge: Codechange: Use null pointer literal instead of the NULL macro	5 years ago
oldloader.h	Cleanup: Fix alignment after NULL -> nullptr change.	5 years ago
oldloader_sl.cpp	Merge branch 'master' into jgrpp	5 years ago
order_sl.cpp	Merge: Codechange: Use null pointer literal instead of the NULL macro	5 years ago
plans_sl.cpp	Merge: Codechange: Use null pointer literal instead of the NULL macro	5 years ago
saveload.cpp	Merge branch 'master' into jgrpp	5 years ago
saveload.h	Merge: Codechange: Use null pointer literal instead of the NULL macro	5 years ago
saveload_buffer.h	Merge: Codechange: Use null pointer literal instead of the NULL macro	5 years ago
saveload_filter.h	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
saveload_internal.h	Merge branch 'template_train_replacement-sx' into jgrpp	8 years ago
signal_sl.cpp	Merge: Codechange: Use null pointer literal instead of the NULL macro	5 years ago
signs_sl.cpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
station_sl.cpp	Merge branch 'master' into jgrpp	5 years ago
storage_sl.cpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
story_sl.cpp	Cleanup: Fix alignment after NULL -> nullptr change.	5 years ago
strings_sl.cpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
subsidy_sl.cpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
tbtr_template_replacement_sl.cpp	Merge: Codechange: Use null pointer literal instead of the NULL macro	5 years ago
tbtr_template_veh_sl.cpp	Merge: Codechange: Use null pointer literal instead of the NULL macro	5 years ago
town_sl.cpp	Merge branch 'master' into jgrpp	5 years ago
tracerestrict_sl.cpp	Merge: Codechange: Use null pointer literal instead of the NULL macro	5 years ago
tunnel_sl.cpp	Merge: Codechange: Use null pointer literal instead of the NULL macro	5 years ago
vehicle_sl.cpp	Merge: Codechange: Use null pointer literal instead of the NULL macro	5 years ago
waypoint_sl.cpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago