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 838b166726 Merge branch 'master' into jgrpp ... # Conflicts: # src/cheat_gui.cpp # src/command.cpp # src/command_func.h # src/company_base.h # src/debug.cpp # src/debug.h # src/economy.cpp # src/engine_type.h # src/graph_gui.cpp # src/misc_cmd.cpp # src/misc_cmd.h # src/network/core/os_abstraction.cpp # src/openttd.cpp # src/saveload/saveload.cpp # src/saveload/saveload.h # src/settings_type.h # src/ship_cmd.cpp # src/stdafx.h # src/tests/bitmath_func.cpp # src/town_cmd.cpp # src/town_gui.cpp		4 months ago
..
core	Merge branch 'master' into jgrpp	4 months ago
CMakeLists.txt	Network: Extend post-desync frame sync history	9 months ago
network.cpp	Split date types into calendar and economy dates	4 months ago
network.h	…
network_admin.cpp	Split date types into calendar and economy dates	4 months ago
network_admin.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_base.h	Split date types into calendar and economy dates	4 months ago
network_chat_gui.cpp	Merge branch 'master' into jgrpp	4 months ago
network_client.cpp	Merge branch 'master' into jgrpp	4 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	Merge branch 'master' into jgrpp	4 months ago
network_content.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_content_gui.cpp	Fix: TextfileWindow called virtual methods before constructor completed. (#11889)	4 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	4 months ago
network_coordinator.h	Merge branch 'master' into jgrpp	4 months ago
network_func.h	Split date types into calendar and economy dates	4 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)	9 months ago
network_gui.cpp	Merge branch 'master' into jgrpp	4 months ago
network_gui.h	Split date types into calendar and economy dates	4 months ago
network_internal.h	Split date types into calendar and economy dates	4 months ago
network_query.cpp	Change: make -dnet=9 give traces of the details of the network protocol (#11931)	4 months ago
network_query.h	Add various missing includes	11 months ago
network_server.cpp	Merge branch 'master' into jgrpp	4 months ago
network_server.h	Merge branch 'master' into jgrpp	4 months ago
network_stun.cpp	Change: make -dnet=9 give traces of the details of the network protocol (#11931)	4 months ago
network_stun.h	Merge branch 'master' into jgrpp	4 months ago
network_survey.cpp	Merge branch 'master' into jgrpp	4 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	Change: make -dnet=9 give traces of the details of the network protocol (#11931)	4 months ago
network_turn.h	Merge branch 'master' into jgrpp	4 months ago
network_type.h	Merge branch 'master' into jgrpp	4 months ago
network_udp.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_udp.h	…