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
..
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	Update NETWORK_GAME_INFO_VERSION to version 7	5 months ago
core.cpp	…
core.h	…
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)	6 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	4 months ago
network_game_info.cpp	Add string codes for upstream wallclock mode, add upstream language changes	4 months ago
network_game_info.h	Add string codes for upstream wallclock mode, add upstream language changes	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	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	Merge branch 'master' into jgrpp	4 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	Merge branch 'master' into jgrpp	4 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