Jonathan G Rennison 3a640af71d Merge branch 'master' into jgrpp ... # Conflicts: # src/ground_vehicle.cpp # src/viewport.cpp		2018-10-29 18:33:15 +00:00
..
airport_defaults.h
airport_movement.h
airporttile_ids.h
airporttiles.h
animcursors.h
autorail.h
bridge_land.h	Raise the maximum number of bridge types to 16	2018-08-07 22:42:36 +01:00
build_industry.h	Fix #4109: Add more water checks to the Oil Rig layout	2018-10-25 20:09:42 +02:00
cargo_const.h
clear_land.h
company_settings.ini
control_codes.h
currency_settings.ini
darklight_colours.h
elrail_data.h
engines.h
gameopt_settings.ini
genland.h
heightmap_colours.h
industry_land.h
landscape_sprite.h
misc_settings.ini
newgrf_debug_data.h	Enable NewGRF debug window for non-GRF vehicles	2018-08-15 03:14:53 +01: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
settings.ini	Add setting to enable flipping direction of all train types in depot	2018-09-11 06:08:02 +01:00
sprites.h
station_land.h
strgen_tables.h
string_colours.h
town_land.h
townname.h
track_land.h
train_cmd.h
tree_land.h
unicode.h
water_land.h
win32_settings.ini
window_settings.ini