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 75dd135e8d Merge tag '14.0-beta3' into jgrpp ... # Conflicts: # regression/regression/result.txt # src/industrytype.h # src/network/core/config.h # src/network/core/network_game_info.cpp # src/network/core/network_game_info.h # src/network/core/packet.cpp # src/network/core/packet.h # src/network/core/tcp.cpp # src/network/core/tcp.h # src/network/core/tcp_admin.cpp # src/network/core/tcp_content.cpp # src/network/core/tcp_coordinator.cpp # src/network/core/tcp_game.cpp # src/network/core/tcp_game.h # src/network/core/tcp_turn.cpp # src/network/core/udp.cpp # src/network/core/udp.h # src/network/network_admin.cpp # src/network/network_client.cpp # src/network/network_client.h # src/network/network_command.cpp # src/network/network_content.cpp # src/network/network_internal.h # src/network/network_query.cpp # src/network/network_query.h # src/network/network_server.cpp # src/network/network_server.h # src/network/network_turn.cpp # src/network/network_udp.cpp # src/rail_gui.cpp # src/road_gui.cpp		3 months ago
..
settings	Merge tag '14.0-beta1' into jgrpp	3 months ago
CMakeLists.txt	Use compatibility table for loading non-table OPTS, PATS chunks	6 months ago
airport_defaults.h	Split date types into calendar and economy dates	3 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	3 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	3 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	3 months ago
opengl_shader.h	…
palette_convert.h	…
palettes.h	…
pricebase.h	…
railtypes.h	Split date types into calendar and economy dates	3 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	3 months ago
roadveh_movement.h	…
settings.h.postamble	…
settings.h.preamble	Merge branch 'master' into jgrpp	3 months ago
settings_compat.h	Merge tag '14.0-beta1' into jgrpp	3 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	3 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