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 7f6b1d6b94 Merge branch 'master' into jgrpp ... # Conflicts: # src/company_cmd.cpp # src/company_func.h # src/core/overflowsafe_type.hpp # src/engine.cpp # src/music/midifile.cpp # src/network/network_command.cpp # src/newgrf_debug_gui.cpp # src/newgrf_roadstop.h # src/newgrf_spritegroup.cpp # src/os/macosx/crashlog_osx.cpp # src/os/unix/crashlog_unix.cpp # src/pathfinder/yapf/yapf_common.hpp # src/road_gui.cpp # src/saveload/engine_sl.cpp # src/script/api/script_depotlist.cpp # src/script/api/script_roadtypelist.cpp # src/settings_gui.cpp # src/settings_type.h # src/strings.cpp # src/table/settings/game_settings.ini		5 months ago
..
CMakeLists.txt	Codechange: workaround CMake/Xcode duplicate file name issue (#11186)	9 months ago
address.cpp	Merge branch 'master' into jgrpp	6 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	6 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	Strong typedef: Use strong typedefs for date, date tick, minutes types	6 months ago
network_game_info.h	Merge branch 'master' into jgrpp	6 months ago
os_abstraction.cpp	Merge branch 'master' into jgrpp	5 months ago
os_abstraction.h	Merge branch 'master' into jgrpp	9 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	6 months ago
tcp.h	MinGW: Remove direct mingw-std-threads includes	6 months ago
tcp_admin.cpp	Merge branch 'master' into jgrpp	6 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	6 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	6 months ago
tcp_coordinator.h	Merge branch 'master' into jgrpp	6 months ago
tcp_game.cpp	Merge branch 'master' into jgrpp	6 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	6 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	6 months ago
tcp_turn.h	Merge branch 'master' into jgrpp	6 months ago
udp.cpp	Merge branch 'master' into jgrpp	6 months ago
udp.h	…