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.
OpenTTD-patches/src/table
Jonathan G Rennison 36eb4165b8 Merge branch 'master' into jgrpp
# Conflicts:
#	src/bridge_map.h
#	src/crashlog.cpp
#	src/industry.h
#	src/linkgraph/linkgraph_type.h
#	src/order_type.h
#	src/saveload/afterload.cpp
#	src/settings.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/spritecache.cpp
#	src/stdafx.h
#	src/table/settings.h.preamble
#	src/train.h
#	src/vehicle.cpp
#	src/viewport.cpp
#	src/viewport_func.h
#	src/widgets/station_widget.h
#	src/zoom_func.h
#	src/zoom_type.h
5 years ago
..
airport_defaults.h Codechange: Use null pointer literal instead of the NULL macro 5 years ago
airport_movement.h Codechange: Remove Direction*Byte types 5 years ago
airporttile_ids.h
airporttiles.h
animcursors.h
autorail.h
bridge_land.h Merge: Codechange: Use null pointer literal instead of the NULL macro 5 years ago
build_industry.h Codechange: Use null pointer literal instead of the NULL macro 5 years ago
cargo_const.h Codechange: Use null pointer literal instead of the NULL macro 5 years ago
clear_land.h
company_settings.ini Merge: Codechange: Use null pointer literal instead of the NULL macro 5 years ago
control_codes.h
currency_settings.ini Merge branch 'master' into jgrpp 5 years ago
darklight_colours.h
elrail_data.h
engines.h Codechange: Remove RailTypeByte type 5 years ago
gameopt_settings.ini Merge branch 'master' into jgrpp 5 years ago
genland.h
heightmap_colours.h
industry_land.h
landscape_sprite.h
misc_settings.ini Merge branch 'master' into jgrpp 5 years ago
newgrf_debug_data.h Add industry and station rect coords to NewGRF debug window info 5 years ago
object_land.h
palette_convert.h
palettes.h
pricebase.h
railtypes.h Codechange: Use null pointer literal instead of the NULL macro 5 years ago
road_land.h
roadveh_movement.h Codechange: Use null pointer literal instead of the NULL macro 5 years ago
settings.h.postamble
settings.h.preamble Merge branch 'master' into jgrpp 5 years ago
settings.ini Merge branch 'master' into jgrpp 5 years ago
sprites.h Merge branches 'crashlog_improvements', 'save_ext' into jgrpp 5 years ago
station_land.h Codechange: Use null pointer literal instead of the NULL macro 5 years ago
strgen_tables.h
string_colours.h
town_land.h Add: Houses can accept up to 16 different cargo types via NewGRF. 6 years ago
townname.h Merge branch 'master' into jgrpp 5 years ago
track_land.h
train_cmd.h
tree_land.h
unicode.h
water_land.h
win32_settings.ini Merge branch 'master' into jgrpp 5 years ago
window_settings.ini Merge branch 'master' into jgrpp 5 years ago