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/core
Jonathan G Rennison ffef1c9e44 Merge branch 'master' into jgrpp-beta
# Conflicts:
#	src/saveload/cargopacket_sl.cpp
#	src/saveload/cheat_sl.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/engine_sl.cpp
#	src/saveload/map_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/station_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/stdafx.h
#	src/table/settings/settings.ini
#	src/town_cmd.cpp
#	src/vehicle.cpp
3 years ago
..
CMakeLists.txt Update: Merge branch 'jgrpp_master_cmake' into jgrpp_cmake 4 years ago
alloc_func.cpp Cleanup: Removed SVN headers 5 years ago
alloc_func.hpp Cleanup: Removed SVN headers 5 years ago
alloc_type.hpp Merge branch 'master' into jgrpp 5 years ago
backup_type.hpp Cleanup: Removed SVN headers 5 years ago
bitmath_func.cpp Merge branch 'master' into jgrpp 5 years ago
bitmath_func.hpp Add brackets around bitmath macro definitions 4 years ago
checksum_func.hpp Debug: Extend random debug logging to also include state checksum updates 3 years ago
container_func.hpp Merge branch 'master' into jgrpp 5 years ago
dyn_arena_alloc.hpp Merge branch 'master' into jgrpp 5 years ago
endian_func.hpp Fix: Globally apply preprocessor directive coding style 4 years ago
endian_type.hpp Fix: Globally apply preprocessor directive coding style 4 years ago
enum_type.hpp Cleanup: Removed SVN headers 5 years ago
geometry_func.cpp Merge branch 'master' into jgrpp 3 years ago
geometry_func.hpp Merge branch 'master' into jgrpp 3 years ago
geometry_type.hpp Merge branch 'master' into jgrpp 3 years ago
kdtree.hpp Codechange: pass large parameter by reference instead of value, especially in a recursive function 3 years ago
math_func.cpp Add int64 cube root and square root functions 3 years ago
math_func.hpp Merge branch 'master' into jgrpp 3 years ago
mem_func.hpp Cleanup: Removed SVN headers 5 years ago
multimap.hpp Merge branch 'master' into jgrpp 5 years ago
overflowsafe_type.hpp Fix OverflowSafeInt INT64_MIN handling when not using overflow builtins 4 years ago
pool_func.cpp Cleanup: Removed SVN headers 5 years ago
pool_func.hpp Merge branch 'master' into jgrpp-beta 3 years ago
pool_type.hpp Merge branch 'master' into jgrpp-beta 3 years ago
random_func.cpp Merge branch 'master' into jgrpp 5 years ago
random_func.hpp Merge branch 'master' into jgrpp 4 years ago
smallmap_type.hpp Merge branch 'master' into jgrpp 3 years ago
smallmatrix_type.hpp Codechange: Remove min/max functions in favour of STL variants (#8502) 4 years ago
smallstack_type.hpp Merge branch 'master' into jgrpp 3 years ago
smallvec_type.hpp Codechange: Remove min/max functions in favour of STL variants (#8502) 4 years ago
span_type.hpp Codechange: C++-ify lists for SaveLoad (#9323) 3 years ago
string_compare_type.hpp Cleanup: Removed SVN headers 5 years ago
tinystring_type.hpp Add TinyString: SLE_STR compatible c-string wrapper 4 years ago