dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
fedfedc492c34c24bae80264ae36f668b7419eef
openttd/src/saveload
History
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
2019-04-16 18:03:08 +01:00
..
afterload.cpp
Merge: Codechange: Use null pointer literal instead of the NULL macro
2019-04-11 18:14:13 +01:00
ai_sl.cpp
Codechange: Use null pointer literal instead of the NULL macro
2019-04-10 23:22:20 +02:00
airport_sl.cpp
Codechange: Use null pointer literal instead of the NULL macro
2019-04-10 23:22:20 +02:00
animated_tile_sl.cpp
Codechange: Use null pointer literal instead of the NULL macro
2019-04-10 23:22:20 +02:00
autoreplace_sl.cpp
Codechange: Use null pointer literal instead of the NULL macro
2019-04-10 23:22:20 +02:00
bridge_signal_sl.cpp
Merge: Codechange: Use null pointer literal instead of the NULL macro
2019-04-11 18:14:13 +01:00
cargomonitor_sl.cpp
Codechange: Use null pointer literal instead of the NULL macro
2019-04-10 23:22:20 +02:00
cargopacket_sl.cpp
Merge: Codechange: Use null pointer literal instead of the NULL macro
2019-04-11 18:14:13 +01:00
cheat_sl.cpp
Codechange: Use null pointer literal instead of the NULL macro
2019-04-10 23:22:20 +02:00
company_sl.cpp
Merge: Codechange: Use null pointer literal instead of the NULL macro
2019-04-11 18:14:13 +01:00
depot_sl.cpp
Merge: Codechange: Use null pointer literal instead of the NULL macro
2019-04-11 18:14:13 +01:00
economy_sl.cpp
Merge branch 'master' into jgrpp
2019-04-16 18:03:08 +01:00
engine_sl.cpp
Cleanup: Fix alignment after NULL -> nullptr change.
2019-04-13 20:35:10 +01:00
extended_ver_sl.cpp
Merge: Codechange: Use null pointer literal instead of the NULL macro
2019-04-11 18:14:13 +01:00
extended_ver_sl.h
Merge: Codechange: Use null pointer literal instead of the NULL macro
2019-04-11 18:14:13 +01:00
game_sl.cpp
Codechange: Use null pointer literal instead of the NULL macro
2019-04-10 23:22:20 +02:00
gamelog_sl.cpp
Merge: Codechange: Use null pointer literal instead of the NULL macro
2019-04-11 18:14:13 +01:00
goal_sl.cpp
Codechange: Use null pointer literal instead of the NULL macro
2019-04-10 23:22:20 +02:00
group_sl.cpp
Codechange: Use null pointer literal instead of the NULL macro
2019-04-10 23:22:20 +02:00
industry_sl.cpp
Cleanup: Fix alignment after NULL -> nullptr change.
2019-04-13 20:35:10 +01:00
labelmaps_sl.cpp
Merge: Codechange: Use null pointer literal instead of the NULL macro
2019-04-11 18:14:13 +01:00
linkgraph_sl.cpp
Merge branch 'master' into jgrpp
2019-04-16 18:03:08 +01:00
map_sl.cpp
Merge branch 'master' into jgrpp
2019-04-16 18:03:08 +01:00
misc_sl.cpp
Merge branch 'master' into jgrpp
2019-04-16 18:03:08 +01:00
newgrf_sl.cpp
Codechange: Use null pointer literal instead of the NULL macro
2019-04-10 23:22:20 +02:00
newgrf_sl.h
(svn r21886) -Codechange: move documentation towards the code to make it more likely to be updated [n].
2011-01-22 09:53:15 +00:00
object_sl.cpp
Cleanup: Fix alignment after NULL -> nullptr change.
2019-04-13 20:35:10 +01:00
oldloader_sl.cpp
Merge branch 'master' into jgrpp
2019-04-16 18:03:08 +01:00
oldloader.cpp
Merge: Codechange: Use null pointer literal instead of the NULL macro
2019-04-11 18:14:13 +01:00
oldloader.h
Cleanup: Fix alignment after NULL -> nullptr change.
2019-04-13 20:35:10 +01:00
order_sl.cpp
Merge: Codechange: Use null pointer literal instead of the NULL macro
2019-04-11 18:14:13 +01:00
plans_sl.cpp
Merge: Codechange: Use null pointer literal instead of the NULL macro
2019-04-11 18:14:13 +01:00
saveload_buffer.h
Merge: Codechange: Use null pointer literal instead of the NULL macro
2019-04-11 18:14:13 +01:00
saveload_filter.h
Codechange: Use null pointer literal instead of the NULL macro
2019-04-10 23:22:20 +02:00
saveload_internal.h
Merge branch 'template_train_replacement-sx' into jgrpp
2016-02-16 21:08:21 +00:00
saveload.cpp
Merge branch 'master' into jgrpp
2019-04-16 18:03:08 +01:00
saveload.h
Merge: Codechange: Use null pointer literal instead of the NULL macro
2019-04-11 18:14:13 +01:00
signal_sl.cpp
Merge: Codechange: Use null pointer literal instead of the NULL macro
2019-04-11 18:14:13 +01:00
signs_sl.cpp
Codechange: Use null pointer literal instead of the NULL macro
2019-04-10 23:22:20 +02:00
station_sl.cpp
Merge branch 'master' into jgrpp
2019-04-16 18:03:08 +01:00
storage_sl.cpp
Codechange: Use null pointer literal instead of the NULL macro
2019-04-10 23:22:20 +02:00
story_sl.cpp
Cleanup: Fix alignment after NULL -> nullptr change.
2019-04-13 20:35:10 +01:00
strings_sl.cpp
Codechange: Use null pointer literal instead of the NULL macro
2019-04-10 23:22:20 +02:00
subsidy_sl.cpp
Codechange: Use null pointer literal instead of the NULL macro
2019-04-10 23:22:20 +02:00
tbtr_template_replacement_sl.cpp
Merge: Codechange: Use null pointer literal instead of the NULL macro
2019-04-11 18:14:13 +01:00
tbtr_template_veh_sl.cpp
Merge: Codechange: Use null pointer literal instead of the NULL macro
2019-04-11 18:14:13 +01:00
town_sl.cpp
Merge branch 'master' into jgrpp
2019-04-16 18:03:08 +01:00
tracerestrict_sl.cpp
Merge: Codechange: Use null pointer literal instead of the NULL macro
2019-04-11 18:14:13 +01:00
tunnel_sl.cpp
Merge: Codechange: Use null pointer literal instead of the NULL macro
2019-04-11 18:14:13 +01:00
vehicle_sl.cpp
Merge: Codechange: Use null pointer literal instead of the NULL macro
2019-04-11 18:14:13 +01:00
waypoint_sl.cpp
Codechange: Use null pointer literal instead of the NULL macro
2019-04-10 23:22:20 +02:00