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 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		7 months ago
..
CMakeLists.txt	Ring buffer: Use as backing for std::queue uses	10 months ago
alloc_func.cpp	Codechange: replace error/usererror printf variant with fmt variant and rename	1 year ago
alloc_func.hpp	Cleanup: Unused alloca definitions and includes	1 year ago
alloc_type.hpp	Sprite cache: Allow caching only required subset of sprite zoom levels	10 months ago
arena_alloc.hpp	Formatting: Fix indentation of public/private specifiers	1 year ago
backup_type.hpp	Add mode to AutoRestoreBackup to not change backed up value	1 year ago
bitmath_func.cpp	Use bitmath builtins for FindLastBit	10 months ago
bitmath_func.hpp	Fix 87911bdf: Fix FindLastBit for unsigned long long (uint64 on Windows)	9 months ago
checksum_func.hpp	Include company infrastructure totals in state checksum	2 years ago
container_func.hpp	Merge branch 'master' into jgrpp	12 months ago
dyn_arena_alloc.hpp	Formatting: Fix indentation of public/private specifiers	1 year ago
endian_func.hpp	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
endian_type.hpp	Fix: Globally apply preprocessor directive coding style	4 years ago
enum_type.hpp	Merge branch 'master' into jgrpp	1 year ago
format.hpp	Codechange: make TimerGameCalendar Date and Year types strongly typed (#10761)	10 months ago
geometry_func.cpp	Add: RectPadding type.	2 years ago
geometry_func.hpp	Merge branch 'master' into jgrpp	3 years ago
geometry_type.hpp	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
hash_func.hpp	Add a simple 32 bit to 32 bit hash function (MurmurHash3)	2 years ago
kdtree.hpp	Merge branch 'master' into jgrpp	7 months ago
math_func.cpp	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
math_func.hpp	Merge branch 'master' into jgrpp	7 months ago
mem_func.hpp	Codechange: Use std::reverse instead of custom implementation. (#10918)	1 year ago
multimap.hpp	Codechange: Move includes for common STL headers to stdafx.	1 year ago
overflowsafe_type.hpp	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
pod_pool.hpp	Formatting: Fix indentation of public/private specifiers	1 year ago
pool_func.cpp	Codechange: replace x.size() == 0 with x.empty()	8 months ago
pool_func.hpp	Codechange: replace error/usererror printf variant with fmt variant and rename	1 year ago
pool_type.hpp	Merge branch 'master' into jgrpp	7 months ago
random_func.cpp	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
random_func.hpp	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
ring_buffer.hpp	Fix narrowing conversion warning in ring_buffer.hpp	7 months ago
ring_buffer_queue.hpp	Ring buffer: Use as backing for std::queue uses	10 months ago
serialisation.cpp	Fix some unused variable warnings when asserts are disabled	7 months ago
serialisation.hpp	Serialisation: Add view/span variants of binary receive methods	1 year ago
smallstack_type.hpp	Add various missing includes	12 months ago
span_type.hpp	Merge branch 'master' into jgrpp	7 months ago
tinystring_type.hpp	Add TinyString: SLE_STR compatible c-string wrapper	4 years ago
y_combinator.hpp	Util: Add a y-combinator template class	2 years ago