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

# Conflicts:
#	src/cheat_gui.cpp
#	src/industry_gui.cpp
#	src/linkgraph/linkgraphschedule.cpp
#	src/misc/getoptdata.h
#	src/music/dmusic.cpp
#	src/network/core/os_abstraction.cpp
#	src/newgrf_engine.cpp
#	src/openttd.cpp
#	src/order_gui.cpp
#	src/os/windows/win32.cpp
#	src/pathfinder/npf/queue.cpp
#	src/smallmap_gui.cpp
#	src/strgen/strgen.cpp

2024-06-08 22:57:36 +01:00

..

cocoa

Merge branch 'master' into jgrpp

2024-05-07 17:21:50 +01:00

allegro_v.cpp

Merge branch 'master' into jgrpp

2024-05-31 22:57:16 +01:00

allegro_v.h

Codechange: Pass std::string_view from drivers instead of char *.

2024-04-10 22:02:04 +01:00

CMakeLists.txt

…

dedicated_v.cpp

Merge branch 'master' into jgrpp

2024-05-07 17:21:50 +01:00

dedicated_v.h

Codechange: Pass std::string_view from drivers instead of char *.

2024-04-10 22:02:04 +01:00

null_v.cpp

Codechange: Pass std::string_view from drivers instead of char *.

2024-04-10 22:02:04 +01:00

null_v.h

Codechange: Pass std::string_view from drivers instead of char *.

2024-04-10 22:02:04 +01:00

opengl.cpp

Merge branch 'master' into jgrpp

2024-05-30 17:54:01 +01:00

opengl.h

Merge branch 'master' into jgrpp

2024-05-07 17:21:50 +01:00

sdl2_default_v.cpp

MinGW: Remove direct mingw-std-threads includes

2023-12-13 23:11:20 +00:00

sdl2_default_v.h

Codechange: Pass std::string_view from drivers instead of char *.

2024-04-10 22:02:04 +01:00

sdl2_opengl_v.cpp

Codechange: Pass std::string_view from drivers instead of char *.

2024-04-10 22:02:04 +01:00

sdl2_opengl_v.h

Codechange: Pass std::string_view from drivers instead of char *.

2024-04-10 22:02:04 +01:00

sdl2_v.cpp

Merge branch 'master' into jgrpp

2024-05-31 22:57:16 +01:00

sdl2_v.h

Codechange: Pass std::string_view from drivers instead of char *.

2024-04-10 22:02:04 +01:00

sdl_v.cpp

Merge branch 'master' into jgrpp

2024-06-08 22:57:36 +01:00

sdl_v.h

Codechange: Pass std::string_view from drivers instead of char *.

2024-04-10 22:02:04 +01:00

video_driver.cpp

Avoid data race in calls to VideoDriver::GetGameInterval

2024-03-20 17:39:46 +00:00

video_driver.hpp

Codechange: Pass std::string_view from drivers instead of char *.

2024-04-10 22:02:04 +01:00

win32_v.cpp

Merge branch 'master' into jgrpp

2024-05-31 22:57:16 +01:00

win32_v.h

Codechange: Pass std::string_view from drivers instead of char *.

2024-04-10 22:02:04 +01:00