Jonathan G Rennison ad1c402ad8 Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/debug.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/settings_type.h
#	src/town_cmd.cpp
#	src/window.cpp

2018-05-03 23:54:51 +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

…

build_industry.h

…

cargo_const.h

…

clear_land.h

…

company_settings.ini

Merge branch 'save_ext' into jgrpp

2017-08-20 10:38:23 +01: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

Add settings callback field to re-order setting options in GUI

2017-08-20 10:37:45 +01: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

…

gameopt_settings.ini

Add settings callback field to re-order setting options in GUI

2017-08-20 10:37:45 +01:00

genland.h

…

heightmap_colours.h

…

industry_land.h

…

landscape_sprite.h

…

misc_settings.ini

Merge branch 'save_ext' into jgrpp

2017-08-20 10:38:23 +01:00

newgrf_debug_data.h

(svn r27654) -Change: Enable C++11 for clang 3.3 (LordAro)

2016-09-05 19:11:01 +00:00

object_land.h

…

palette_convert.h

…

palettes.h

…

pricebase.h

Revert back to v2 of house picking/placing patch.

2016-05-12 22:35:39 +01:00

railtypes.h

…

road_land.h

…

roadveh_movement.h

…

settings.h.postamble

…

settings.h.preamble

Add settings callback field to re-order setting options in GUI

2017-08-20 10:37:45 +01:00

settings.ini

Merge branch 'master' into jgrpp

2018-05-03 23:54:51 +01:00

sprites.h

…

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

Revert back to v2 of house picking/placing patch.

2016-05-12 22:35:39 +01:00

townname.h

Silence -Wunused-variable warnings in src/table/townname.h

2016-09-05 23:16:47 +01:00

track_land.h

…

train_cmd.h

…

tree_land.h

…

unicode.h

…

water_land.h

…

win32_settings.ini

Add settings callback field to re-order setting options in GUI

2017-08-20 10:37:45 +01:00

window_settings.ini

Add settings callback field to re-order setting options in GUI

2017-08-20 10:37:45 +01:00