Jonathan G Rennison a98a56669b Merge branch 'master' into jgrpp ...

# Conflicts:
#	regression/regression/result.txt
#	src/autoreplace_cmd.cpp
#	src/industry_gui.cpp
#	src/landscape.cpp
#	src/network/network_content.cpp
#	src/newgrf_roadstop.cpp
#	src/pathfinder/yapf/yapf_ship.cpp
#	src/road_gui.cpp
#	src/saveload/ai_sl.cpp
#	src/saveload/saveload.h
#	src/saveload/vehicle_sl.cpp
#	src/station.cpp
#	src/station_gui.cpp
#	src/video/cocoa/cocoa_ogl.h
#	src/video/sdl2_opengl_v.h
#	src/video/video_driver.hpp
#	src/video/win32_v.h
#	src/widget_type.h
#	src/widgets/dropdown.cpp
#	src/widgets/dropdown_type.h
#	src/window.cpp

2024-02-19 23:11:00 +00:00

..

address.cpp

Merge branch 'master' into jgrpp

2024-01-25 18:37:23 +00:00

address.h

Merge tag '14.0-beta3' into jgrpp

2024-02-19 17:57:05 +00:00

CMakeLists.txt

Codechange: workaround CMake/Xcode duplicate file name issue (#11186)

2023-09-02 19:46:52 +02:00

config.cpp

Merge branch 'master' into jgrpp

2023-07-01 02:42:51 +01:00

config.h

Merge tag '14.0-beta3' into jgrpp

2024-02-19 17:57:05 +00:00

core.cpp

Codechange: convert printf DEBUG statements to fmt Debug statements

2021-06-13 12:45:45 +02:00

core.h

Codechange: use default dtor instead of empty (#10826)

2023-05-14 23:31:03 +02:00

host.cpp

Merge branch 'master' into jgrpp

2024-01-05 13:37:52 +00:00

host.h

Cleanup: Removed SVN headers

2019-11-10 17:59:20 +00:00

http_curl.cpp

Merge branch 'master' into jgrpp

2024-02-19 23:11:00 +00:00

http_none.cpp

Codechange: Silence warnings about intentionally unused parameters.

2023-09-19 22:49:59 +02:00

http_shared.h

Merge branch 'master' into jgrpp

2024-01-05 22:11:28 +00:00

http_winhttp.cpp

Merge branch 'master' into jgrpp

2024-02-19 23:11:00 +00:00

http.h

Fix: race-conditions in GUI updates when downloading HTTP files (#11639)

2024-01-02 22:05:25 +01:00

network_game_info.cpp

Merge tag '14.0-beta3' into jgrpp

2024-02-19 17:57:05 +00:00

network_game_info.h

Merge tag '14.0-beta3' into jgrpp

2024-02-19 17:57:05 +00:00

os_abstraction.cpp

Merge branch 'master' into jgrpp

2024-02-17 11:53:35 +00:00

os_abstraction.h

Merge branch 'master' into jgrpp

2024-01-07 15:00:16 +00:00

packet.cpp

Codechange: use std::deque of std::unique_ptr to queue packets

2024-02-05 16:30:49 +01:00

packet.h

Merge tag '14.0-beta3' into jgrpp

2024-02-19 17:57:05 +00:00

tcp_admin.cpp

Merge tag '14.0-beta3' into jgrpp

2024-02-19 17:57:05 +00:00

tcp_admin.h

Merge tag '14.0-beta3' into jgrpp

2024-02-19 17:57:05 +00:00

tcp_connect.cpp

Merge branch 'master' into jgrpp

2024-02-09 18:50:49 +00:00

tcp_content_type.h

Merge tag '14.0-beta3' into jgrpp

2024-02-19 17:57:05 +00:00

tcp_content.cpp

Merge tag '14.0-beta3' into jgrpp

2024-02-19 17:57:05 +00:00

tcp_content.h

Merge tag '14.0-beta3' into jgrpp

2024-02-19 17:57:05 +00:00

tcp_coordinator.cpp

Merge tag '14.0-beta3' into jgrpp

2024-02-19 17:57:05 +00:00

tcp_coordinator.h

Merge tag '14.0-beta3' into jgrpp

2024-02-19 17:57:05 +00:00

tcp_game.cpp

Merge tag '14.0-beta3' into jgrpp

2024-02-19 17:57:05 +00:00

tcp_game.h

Merge tag '14.0-beta3' into jgrpp

2024-02-19 17:57:05 +00:00

tcp_listen.h

Adding of _t to (u)int types, and WChar to char32_t

2024-01-07 17:20:41 +00:00

tcp_stun.cpp

Merge tag '14.0-beta3' into jgrpp

2024-02-19 17:57:05 +00:00

tcp_stun.h

Merge tag '14.0-beta3' into jgrpp

2024-02-19 17:57:05 +00:00

tcp_turn.cpp

Merge tag '14.0-beta3' into jgrpp

2024-02-19 17:57:05 +00:00

tcp_turn.h

Merge tag '14.0-beta3' into jgrpp

2024-02-19 17:57:05 +00:00

tcp.cpp

Merge tag '14.0-beta3' into jgrpp

2024-02-19 17:57:05 +00:00

tcp.h

Merge tag '14.0-beta3' into jgrpp

2024-02-19 17:57:05 +00:00

udp.cpp

Merge tag '14.0-beta3' into jgrpp

2024-02-19 17:57:05 +00:00

udp.h

Merge tag '14.0-beta3' into jgrpp

2024-02-19 17:57:05 +00:00