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 2a31095118 Merge branch 'master' into jgrpp
# Conflicts:
#	regression/regression/result.txt
#	src/aircraft_cmd.cpp
#	src/airport_gui.cpp
#	src/articulated_vehicles.cpp
#	src/console_cmds.cpp
#	src/date_gui.cpp
#	src/engine.cpp
#	src/genworld_gui.cpp
#	src/gfx_layout_fallback.cpp
#	src/group_gui.cpp
#	src/hotkeys.cpp
#	src/network/core/tcp_connect.cpp
#	src/network/core/tcp_listen.h
#	src/newgrf.cpp
#	src/newgrf.h
#	src/newgrf_engine.cpp
#	src/newgrf_gui.cpp
#	src/newgrf_station.cpp
#	src/openttd.cpp
#	src/order_gui.cpp
#	src/os/macosx/osx_main.cpp
#	src/pathfinder/yapf/yapf_node_rail.hpp
#	src/rail_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/cargopacket_sl.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/saveload/station_sl.cpp
#	src/script/api/script_industrytype.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_table.cpp
#	src/settingsgen/settingsgen.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/strings.cpp
#	src/timer/timer_game_calendar.cpp
#	src/timer/timer_game_calendar.h
#	src/timer/timer_manager.h
#	src/timer/timer_window.cpp
#	src/timetable_cmd.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/town_gui.cpp
#	src/train_gui.cpp
#	src/vehicle_cmd.h
#	src/vehicle_gui.cpp
#	src/viewport.cpp
#	src/widgets/dropdown.cpp
#	src/window_func.h
#	src/window_gui.h
6 months ago
..
catch2 Codechange: replace x.size() == 0 with x.empty() 7 months ago
cpp-btree cpp-btreee: Fix alloc/dealloc size mismatch (struct padding) 9 months ago
fmt Fix: false positive warning in fmt library (backport ef55d4f of upstream fmt) 11 months ago
icu Feature: drop ICU-lx in favour of directly interfacing with harfbuzz 1 year ago
md5 Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 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
nlohmann Codechange: vendor the nlohmann-json library (#11290) 7 months ago
opengl Codechange: [Win32] Try to get an OpenGL 3.2+ context if possible. 3 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 6 months ago
CMakeLists.txt Codechange: vendor the nlohmann-json library (#11290) 7 months ago
README.licensing Add: catch2 v2.13.10 10 months 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.md
and in this directory or subdirectories as well.