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.

Jonathan G Rennison a98a56669b Merge branch 'master' into jgrpp ... # Conflicts: # regression/regression/result.txt # src/autoreplace_cmd.cpp # src/industry_gui.cpp # src/landscape.cpp # src/network/network_content.cpp # src/newgrf_roadstop.cpp # src/pathfinder/yapf/yapf_ship.cpp # src/road_gui.cpp # src/saveload/ai_sl.cpp # src/saveload/saveload.h # src/saveload/vehicle_sl.cpp # src/station.cpp # src/station_gui.cpp # src/video/cocoa/cocoa_ogl.h # src/video/sdl2_opengl_v.h # src/video/video_driver.hpp # src/video/win32_v.h # src/widget_type.h # src/widgets/dropdown.cpp # src/widgets/dropdown_type.h # src/window.cpp		3 months ago
..
settings	Merge branch 'master' into jgrpp	3 months ago
CMakeLists.txt	…
airport_defaults.h	Split date types into calendar and economy dates	4 months ago
airport_movement.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
airporttile_ids.h	…
airporttiles.h	…
animcursors.h	…
autorail.h	…
bridge_land.h	Split date types into calendar and economy dates	4 months ago
build_industry.h	Merge tag '14.0-beta3' into jgrpp	3 months ago
cargo_const.h	Merge tag '14.0-beta2' into jgrpp	3 months ago
clear_land.h	…
control_codes.h	Add string codes for upstream wallclock mode, add upstream language changes	4 months ago
darklight_colours.h	…
elrail_data.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
engines.h	Merge tag '14.0-beta3' into jgrpp	3 months ago
genland.h	…
heightmap_colours.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
industry_land.h	…
landscape_sprite.h	…
newgrf_debug_data.h	Merge tag '14.0-beta2' into jgrpp	3 months ago
object_land.h	Split date types into calendar and economy dates	4 months ago
opengl_shader.h	…
palette_convert.h	…
palettes.h	…
pricebase.h	…
railtypes.h	Split date types into calendar and economy dates	4 months ago
road_land.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
roadtypes.h	Split date types into calendar and economy dates	4 months ago
roadveh_movement.h	…
settings.h.postamble	…
settings.h.preamble	Merge branch 'master' into jgrpp	4 months ago
settings_compat.h	Merge tag '14.0-beta1' into jgrpp	4 months ago
sprites.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
station_land.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
strgen_tables.h	Add string codes for upstream wallclock mode, add upstream language changes	4 months ago
string_colours.h	…
town_land.h	Merge tag '14.0-beta2' into jgrpp	3 months ago
townname.h	Merge branch 'master' into jgrpp	4 months ago
track_land.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
train_cmd.h	…
tree_land.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
unicode.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
water_land.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago