OpenTTD-patches/src/3rdparty
Jonathan G Rennison 1bfd96c7f2 Merge branch 'master' into jgrpp
# Conflicts:
#	src/3rdparty/fmt/core.h
#	src/command_type.h
#	src/console_cmds.cpp
#	src/core/overflowsafe_type.hpp
#	src/landscape.cpp
#	src/network/network.cpp
#	src/newgrf_object.h
#	src/object_cmd.cpp
#	src/order_gui.cpp
#	src/saveload/vehicle_sl.cpp
#	src/script/api/script_industrytype.cpp
#	src/script/api/script_object.hpp
#	src/script/api/script_town.cpp
#	src/table/object_land.h
#	src/timetable_cmd.cpp
#	src/tree_cmd.cpp
#	src/vehicle_gui.cpp
#	src/window.cpp
2023-01-15 19:28:37 +00:00
..
cpp-btree Change various asserts to not be included in release builds 2022-10-22 12:34:54 +01:00
md5
mingw-std-threads
monocypher Monocypher: Fix narrowing conversion warning 2022-01-03 22:31:21 +00:00
opengl
optional Comment out additional include of <cassert> 2022-11-03 18:58:24 +00:00
os2
randombytes Random bytes: Fix minor compilation warnings 2022-01-03 22:29:00 +00:00
squirrel Merge branch 'master' into jgrpp 2023-01-15 19:28:37 +00:00
CMakeLists.txt Add randombytes lib to src/3rdparty 2022-01-02 20:40:08 +00:00
README.licensing

The files in this directory are not licensed under the same terms as the
rest of OpenTTD. Licensing details can be found in OpenTTD's readme.txt
and in this directory or subdirectories as well.