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		4 months ago
..
CMakeLists.txt	Codechange: workaround CMake/Xcode duplicate file name issue (#11186)	9 months ago
address.cpp	Merge branch 'master' into jgrpp	5 months ago
address.h	Merge tag '14.0-beta3' into jgrpp	4 months ago
config.cpp	Merge branch 'master' into jgrpp	12 months ago
config.h	Merge tag '14.0-beta3' into jgrpp	4 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	4 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	Merge branch 'master' into jgrpp	4 months ago
network_game_info.cpp	Merge tag '14.0-beta3' into jgrpp	4 months ago
network_game_info.h	Merge tag '14.0-beta3' into jgrpp	4 months ago
os_abstraction.cpp	Merge branch 'master' into jgrpp	4 months ago
os_abstraction.h	Merge branch 'master' into jgrpp	5 months ago
packet.cpp	Codechange: use std::deque of std::unique_ptr to queue packets	4 months ago
packet.h	Merge tag '14.0-beta3' into jgrpp	4 months ago
tcp.cpp	Merge tag '14.0-beta3' into jgrpp	4 months ago
tcp.h	Merge tag '14.0-beta3' into jgrpp	4 months ago
tcp_admin.cpp	Merge tag '14.0-beta3' into jgrpp	4 months ago
tcp_admin.h	Merge tag '14.0-beta3' into jgrpp	4 months ago
tcp_connect.cpp	Merge branch 'master' into jgrpp	4 months ago
tcp_content.cpp	Merge tag '14.0-beta3' into jgrpp	4 months ago
tcp_content.h	Merge tag '14.0-beta3' into jgrpp	4 months ago
tcp_content_type.h	Merge tag '14.0-beta3' into jgrpp	4 months ago
tcp_coordinator.cpp	Merge tag '14.0-beta3' into jgrpp	4 months ago
tcp_coordinator.h	Merge tag '14.0-beta3' into jgrpp	4 months ago
tcp_game.cpp	Merge tag '14.0-beta3' into jgrpp	4 months ago
tcp_game.h	Merge tag '14.0-beta3' into jgrpp	4 months ago
tcp_listen.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
tcp_stun.cpp	Merge tag '14.0-beta3' into jgrpp	4 months ago
tcp_stun.h	Merge tag '14.0-beta3' into jgrpp	4 months ago
tcp_turn.cpp	Merge tag '14.0-beta3' into jgrpp	4 months ago
tcp_turn.h	Merge tag '14.0-beta3' into jgrpp	4 months ago
udp.cpp	Merge tag '14.0-beta3' into jgrpp	4 months ago
udp.h	Merge tag '14.0-beta3' into jgrpp	4 months ago