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
..
core	Merge branch 'master' into jgrpp	5 months ago
CMakeLists.txt	Network: Extend post-desync frame sync history	10 months ago
network.cpp	Merge branch 'master' into jgrpp	5 months ago
network.h	…
network_admin.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_admin.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_base.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_chat_gui.cpp	Merge branch 'master' into jgrpp	5 months ago
network_client.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_client.h	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
network_command.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_content.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_content.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_content_gui.cpp	Merge branch 'master' into jgrpp	5 months ago
network_content_gui.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_coordinator.cpp	Merge branch 'master' into jgrpp	5 months ago
network_coordinator.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_func.h	Merge branch 'master' into jgrpp	5 months ago
network_gamelist.cpp	Codechange: make the MD5 hash/digest/checksum variables a std::array	1 year ago
network_gamelist.h	Codechange: workaround CMake/Xcode duplicate file name issue (#11186)	10 months ago
network_gui.cpp	Merge branch 'master' into jgrpp	5 months ago
network_gui.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_internal.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_query.cpp	Merge branch 'master' into jgrpp	7 months ago
network_query.h	Add various missing includes	12 months ago
network_server.cpp	Codechange: compile-time validate the string format of IConsolePrint (#11804)	5 months ago
network_server.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_stun.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_stun.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_survey.cpp	Survey: Update to match upstream	5 months ago
network_survey.h	Merge branch 'master' into jgrpp	5 months ago
network_sync.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_turn.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_turn.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_type.h	Merge branch 'master' into jgrpp	5 months ago
network_udp.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_udp.h	…