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 55d78a23be Merge branch 'master' into jgrpp ... # Conflicts: # src/3rdparty/squirrel/include/squirrel.h # src/blitter/32bpp_sse_func.hpp # src/bridge_map.h # src/clear_map.h # src/company_manager_face.h # src/console_func.h # src/core/bitmath_func.hpp # src/core/endian_func.hpp # src/core/random_func.hpp # src/depot_map.h # src/elrail_func.h # src/fontcache.h # src/industry_map.h # src/map_func.h # src/newgrf_spritegroup.h # src/object_map.h # src/rail.h # src/rail_map.h # src/road_func.h # src/road_map.h # src/saveload/saveload.h # src/saveload/saveload_error.hpp # src/settings_gui.cpp # src/sl/oldloader.h # src/sprite.h # src/spritecache.h # src/station_func.h # src/station_map.h # src/story_base.h # src/strings_func.h # src/tile_cmd.h # src/tile_map.h # src/tile_type.h # src/town.h # src/town_map.h # src/tree_map.h # src/tunnel_map.h # src/tunnelbridge_map.h # src/vehicle_func.h # src/viewport_func.h # src/void_map.h # src/water.h # src/water_map.h # src/widget_type.h		5 months ago
..
CMakeLists.txt	Codechange: workaround CMake/Xcode duplicate file name issue (#11186)	9 months ago
address.cpp	Merge branch 'master' into jgrpp	7 months ago
address.h	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
config.cpp	Merge branch 'master' into jgrpp	11 months ago
config.h	Merge branch 'master' into jgrpp	7 months ago
core.cpp	…
core.h	Codechange: use default dtor instead of empty (#10826)	1 year ago
host.cpp	Merge branch 'master' into jgrpp	5 months ago
host.h	…
http.h	Fix: race-conditions in GUI updates when downloading HTTP files (#11639)	5 months ago
http_curl.cpp	Merge branch 'master' into jgrpp	5 months ago
http_none.cpp	Codechange: Silence warnings about intentionally unused parameters.	9 months ago
http_shared.h	Merge branch 'master' into jgrpp	5 months ago
http_winhttp.cpp	Fix: race-conditions in GUI updates when downloading HTTP files (#11639)	5 months ago
network_game_info.cpp	Fix narrowing warnings on MSVC	5 months ago
network_game_info.h	Merge branch 'master' into jgrpp	7 months ago
os_abstraction.cpp	Merge branch 'master' into jgrpp	5 months ago
os_abstraction.h	Merge branch 'master' into jgrpp	5 months ago
packet.cpp	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
packet.h	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
tcp.cpp	Merge branch 'master' into jgrpp	7 months ago
tcp.h	MinGW: Remove direct mingw-std-threads includes	6 months ago
tcp_admin.cpp	Merge branch 'master' into jgrpp	7 months ago
tcp_admin.h	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
tcp_connect.cpp	Merge branch 'master' into jgrpp	6 months ago
tcp_content.cpp	Merge branch 'master' into jgrpp	7 months ago
tcp_content.h	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
tcp_content_type.h	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
tcp_coordinator.cpp	Merge branch 'master' into jgrpp	7 months ago
tcp_coordinator.h	Merge branch 'master' into jgrpp	7 months ago
tcp_game.cpp	Merge branch 'master' into jgrpp	7 months ago
tcp_game.h	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
tcp_listen.h	Merge branch 'master' into jgrpp	6 months ago
tcp_stun.cpp	Merge branch 'master' into jgrpp	7 months ago
tcp_stun.h	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
tcp_turn.cpp	Merge branch 'master' into jgrpp	7 months ago
tcp_turn.h	Merge branch 'master' into jgrpp	7 months ago
udp.cpp	Merge branch 'master' into jgrpp	6 months ago
udp.h	…