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/3rdparty
Jonathan G Rennison ead18b2af2 Merge branch 'master' into jgrpp
# Conflicts:
#	CMakeLists.txt
#	src/3rdparty/md5/md5.h
#	src/3rdparty/squirrel/squirrel/squtils.h
#	src/animated_tile.cpp
#	src/console_func.h
#	src/core/CMakeLists.txt
#	src/core/container_func.hpp
#	src/core/smallstack_type.hpp
#	src/crashlog.cpp
#	src/crashlog.h
#	src/debug.h
#	src/economy.cpp
#	src/gamelog.cpp
#	src/industry_gui.cpp
#	src/lang/catalan.txt
#	src/misc_gui.cpp
#	src/network/network_content.h
#	src/newgrf.cpp
#	src/newgrf.h
#	src/newgrf_config.cpp
#	src/newgrf_config.h
#	src/newgrf_gui.cpp
#	src/os/unix/font_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/rail_cmd.cpp
#	src/saveload/animated_tile_sl.cpp
#	src/script/api/script_tilelist.cpp
#	src/settings.cpp
#	src/settingsgen/settingsgen.cpp
#	src/sl/oldloader_sl.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/strgen/strgen.cpp
#	src/strgen/strgen_base.cpp
#	src/table/settings/gui_settings.ini
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_cmd.cpp
#	src/vehicle_gui_base.h
#	src/viewport_sprite_sorter.h
11 months ago
..
cpp-btree cpp-btree: Add support for uncopyable/move-only map/multimap value types 1 year ago
fmt Fix: work around GCC compiler bug #105120 in fmt 1 year ago
icu Feature: drop ICU-lx in favour of directly interfacing with harfbuzz 1 year ago
md5 Merge branch 'master' into jgrpp 11 months ago
mingw-std-threads MinGW std:🧵 suppress redundancy warning for non-debug builds 3 years ago
monocypher 3rdparty: Update monocypher from 3.1.3 to 4.0.1 12 months ago
opengl Codechange: [Win32] Try to get an OpenGL 3.2+ context if possible. 3 years ago
os2 Add: introduce CMake for project management 4 years ago
randombytes Random bytes: Fix minor compilation warnings 2 years ago
robin_hood Add robin_hood hash set/map containers to 3rdparty 1 year ago
squirrel Merge branch 'master' into jgrpp 11 months ago
CMakeLists.txt Remove src/3rdparty/optional 1 year ago
README.licensing Add: catch2 v2.13.10 1 year ago

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.