Jonathan G Rennison 361758b516 Merge branches 'crashlog_improvements', 'save_ext' into jgrpp ... # Conflicts: # Makefile.src.in # projects/openttd_vs140.vcxproj # projects/openttd_vs140.vcxproj.filters # projects/openttd_vs141.vcxproj # projects/openttd_vs141.vcxproj.filters # projects/openttd_vs142.vcxproj # projects/openttd_vs142.vcxproj.filters # src/core/smallstack_type.hpp # src/linkgraph/linkgraphjob.cpp # src/linkgraph/linkgraphjob.h # src/misc.cpp # src/network/network_udp.cpp # src/openttd.cpp # src/saveload/saveload.cpp		2019-04-09 19:06:26 +01:00
..
airport_defaults.h	(svn r27908) -Codechange: Mark airport tile tables and FTAs "const" to be sure that they are really constant	2017-08-31 06:55:38 +00:00
airport_movement.h
airporttile_ids.h
airporttiles.h
animcursors.h
autorail.h
bridge_land.h	Implement custom bridge pillar flag support	2018-11-17 19:49:05 +00:00
build_industry.h	Add: Industries can produce and accept up to 16 different cargoes	2018-11-03 21:43:54 +01:00
cargo_const.h
clear_land.h
company_settings.ini	Add company setting to advance order when cloning/copying/sharing	2019-02-26 01:05:29 +00:00
control_codes.h	Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp	2018-04-27 02:42:20 +01:00
currency_settings.ini	Merge branch 'cpp-11' into save_ext	2019-02-04 18:24:38 +00:00
darklight_colours.h
elrail_data.h	(svn r27972) -Fix (r15271) [FS#6670]: Catenary sprites got mixed up for depots.	2018-03-05 21:24:48 +00:00
engines.h	Fix: Set MU flag on some default engines.	2019-02-01 07:08:55 +00:00
gameopt_settings.ini	Merge branch 'cpp-11' into save_ext	2019-04-09 18:54:02 +01:00
genland.h
heightmap_colours.h
industry_land.h
landscape_sprite.h
misc_settings.ini	Merge branch 'cpp-11' into save_ext	2019-04-09 18:54:02 +01:00
newgrf_debug_data.h	Merge branch 'master' into jgrpp	2019-03-27 18:12:04 +00:00
object_land.h
palette_convert.h
palettes.h
pricebase.h
railtypes.h
road_land.h
roadveh_movement.h
settings.h.postamble
settings.h.preamble	Merge branch 'master' into save_ext	2018-07-02 18:41:39 +01:00
settings.ini	Merge branch 'cpp-11' into save_ext	2019-04-09 18:54:02 +01:00
sprites.h	Merge branches 'crashlog_improvements', 'save_ext' into jgrpp	2019-04-09 19:06:26 +01:00
station_land.h
strgen_tables.h	Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp	2018-04-27 02:42:20 +01:00
string_colours.h
town_land.h	Add: Houses can accept up to 16 different cargo types via NewGRF.	2019-01-21 16:06:25 +01:00
townname.h	Merge branch 'master' into cpp-11	2019-04-09 18:47:28 +01:00
track_land.h
train_cmd.h
tree_land.h
unicode.h
water_land.h
win32_settings.ini	Merge branch 'cpp-11' into save_ext	2019-02-04 18:24:38 +00:00
window_settings.ini	Merge branch 'cpp-11' into save_ext	2019-02-04 18:24:38 +00:00