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 822ecae85d Merge branch 'master' into jgrpp ... # Conflicts: # src/cargotype.h # src/core/CMakeLists.txt # src/core/span_type.hpp # src/fileio.cpp # src/fios.cpp # src/misc/endian_buffer.hpp # src/misc_gui.cpp # src/saveload/saveload.h # src/saveload/vehicle_sl.cpp # src/screenshot.cpp # src/settings.cpp # src/settings_internal.h # src/stdafx.h # src/string_func.h # src/strings.cpp # src/strings_func.h # src/strings_internal.h		5 months ago
..
CMakeLists.txt	Codechange: workaround CMake/Xcode duplicate file name issue (#11186)	10 months ago
address.cpp	Merge branch 'master' into jgrpp	5 months ago
address.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
config.cpp	Merge branch 'master' into jgrpp	12 months ago
config.h	Merge branch 'master' into jgrpp	5 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	Merge branch 'master' into jgrpp	5 months ago
network_game_info.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_game_info.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
os_abstraction.cpp	Fix: compilation without precompiled headers (#11770)	5 months ago
os_abstraction.h	Merge branch 'master' into jgrpp	5 months ago
packet.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
packet.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
tcp.cpp	Merge branch 'master' into jgrpp	7 months ago
tcp.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
tcp_admin.cpp	Merge branch 'master' into jgrpp	7 months ago
tcp_admin.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
tcp_connect.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
tcp_content.cpp	Merge branch 'master' into jgrpp	7 months ago
tcp_content.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
tcp_content_type.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
tcp_coordinator.cpp	Merge branch 'master' into jgrpp	7 months ago
tcp_coordinator.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
tcp_game.cpp	Merge branch 'master' into jgrpp	7 months ago
tcp_game.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
tcp_listen.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
tcp_stun.cpp	Merge branch 'master' into jgrpp	7 months ago
tcp_stun.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
tcp_turn.cpp	Merge branch 'master' into jgrpp	7 months ago
tcp_turn.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
udp.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
udp.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago