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.
OpenTTD-patches/src/os/unix
Jonathan G Rennison 8ae1587987 Merge branch 'master' into jgrpp
# Conflicts:
#	src/os/windows/crashlog_win.cpp
#	src/os/windows/font_win32.cpp
#	src/os/windows/win32.cpp
#	src/os/windows/win32.h
#	src/video/win32_v.cpp
#	src/video/win32_v.h
5 months ago
..
CMakeLists.txt Codechange: refactor the Windows-only DllLoader in a cross-platform LibraryLoader (#11751) 5 months ago
crashlog_unix.cpp Codechange: coding style fixes 5 months ago
font_unix.cpp Merge branch 'master' into jgrpp 7 months ago
library_loader_unix.cpp Codechange: refactor the Windows-only DllLoader in a cross-platform LibraryLoader (#11751) 5 months ago
survey_unix.cpp Codechange: vendor the nlohmann-json library (#11290) 7 months ago
unix.cpp Merge branch 'master' into jgrpp 6 months ago
unix_main.cpp Test: Add upstream tests 6 months ago