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.

Jonathan G Rennison 32b8ec34ff Merge branch 'master' into jgrpp ... # Conflicts: # src/autoreplace_gui.cpp # src/build_vehicle_gui.cpp # src/cheat_gui.cpp # src/company_gui.cpp # src/debug.cpp # src/engine_gui.h # src/error_gui.cpp # src/group_gui.cpp # src/industry_cmd.cpp # src/industry_gui.cpp # src/misc_gui.cpp # src/network/network_gui.cpp # src/newgrf.cpp # src/newgrf_debug_gui.cpp # src/newgrf_gui.cpp # src/order_gui.cpp # src/rail_gui.cpp # src/road_gui.cpp # src/saveload/saveload.cpp # src/screenshot_gui.cpp # src/sound/win32_s.cpp # src/statusbar_gui.cpp # src/strgen/strgen.cpp # src/table/newgrf_debug_data.h # src/timetable_gui.cpp # src/toolbar_gui.cpp # src/town_gui.cpp # src/vehicle_gui.cpp # src/video/sdl2_v.cpp # src/video/sdl_v.cpp # src/viewport.cpp		4 weeks ago
..
CMakeLists.txt	Workaround missing std::bit_cast on some compilers	4 months ago
alloc_func.cpp	Merge tag '14.0-beta1' into jgrpp	4 months ago
alloc_func.hpp	Merge tag '14.0-beta1' into jgrpp	4 months ago
alloc_type.hpp	Merge branch 'master' into jgrpp	2 months ago
arena_alloc.hpp	Formatting: Fix indentation of public/private specifiers	1 year ago
backup_type.hpp	Codechange: use std::source_location over __FILE__ and __LINE__ for Backup	4 months ago
bit_cast.hpp	Workaround missing std::bit_cast on some compilers	4 months ago
bitmath_func.hpp	Merge branch 'master' into jgrpp	5 months ago
checksum_func.hpp	Merge branch 'master' into jgrpp	2 months ago
container_func.hpp	Merge branch 'master' into jgrpp	1 year ago
dyn_arena_alloc.hpp	Formatting: Fix indentation of public/private specifiers	1 year ago
endian_func.hpp	Merge branch 'master' into jgrpp	5 months ago
endian_type.hpp	Add an option to disable use of tagged pointers	4 months ago
enum_type.hpp	Merge branch 'master' into jgrpp	2 months ago
format.hpp	Update fmt StrongType adapter	5 months ago
geometry_func.cpp	Merge branch 'master' into jgrpp	6 months ago
geometry_func.hpp	Merge branch 'master' into jgrpp	6 months ago
geometry_type.hpp	Merge branch 'master' into jgrpp	5 months ago
hash_func.hpp	Add a simple 64 bit to 64 bit hash (from MurmurHash3)	5 months ago
kdtree.hpp	Merge branch 'master' into jgrpp	7 months ago
math_func.cpp	Merge branch 'master' into jgrpp	5 months ago
math_func.hpp	Merge branch 'master' into jgrpp	4 weeks ago
mem_func.hpp	Codechange: rename byte to uint8_t (#12308)	3 months ago
multimap.hpp	Codechange: Move includes for common STL headers to stdafx.	1 year ago
overflowsafe_type.hpp	Merge branch 'master' into jgrpp	2 months ago
pod_pool.hpp	Adding of _t to (u)int types, and WChar to char32_t	6 months ago
pool_func.cpp	Codechange: replace x.size() == 0 with x.empty()	8 months ago
pool_func.hpp	Merge branch 'master' into jgrpp	2 months ago
pool_type.hpp	Add whether the vehicle is non-front to the vehicle pool pointer tag	4 months ago
random_func.cpp	Merge branch 'master' into jgrpp	2 months ago
random_func.hpp	Codechange: use std::source_location over __FILE__ and __LINE__ for Random	4 months ago
ring_buffer.hpp	Merge branch 'master' into jgrpp	2 months ago
ring_buffer_queue.hpp	Ring buffer: Use as backing for std::queue uses	10 months ago
serialisation.cpp	Merge branch 'master' into jgrpp	2 months ago
serialisation.hpp	Merge branch 'master' into jgrpp	2 months ago
smallstack_type.hpp	Add various missing includes	1 year ago
strong_typedef_type.hpp	Strong typedef: Add edit_base() method to return a base reference	6 months ago
tinystring_type.hpp	…
y_combinator.hpp	Util: Add a y-combinator template class	2 years ago