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 6459e62fff Merge branch 'master' into jgrpp ... # Conflicts: # src/lang/english.txt # src/map_type.h # src/network/network_command.cpp # src/object_cmd.cpp # src/rail_cmd.cpp # src/road_cmd.cpp # src/road_func.h # src/saveload/afterload.cpp # src/saveload/saveload.h # src/settings_gui.cpp # src/string.cpp # src/table/road_land.h # src/table/settings/game_settings.ini # src/table/settings/world_settings.ini # src/tbtr_template_gui_main.h # src/train_cmd.cpp		2 years ago
..
CMakeLists.txt	Change: [Network] Transfer command data as serialized byte stream without fixed structure.	3 years ago
array.hpp	Codechange: Replace CStrA with std::string	3 years ago
binaryheap.hpp	Fix: Globally apply preprocessor directive coding style	4 years ago
countedobj.cpp	Cleanup: Removed SVN headers	5 years ago
countedptr.hpp	Cleanup: Removed SVN headers	5 years ago
dbg_helpers.cpp	Cleanup: Delete remaining Blob code	3 years ago
dbg_helpers.h	Cleanup: remove unused copy-constructor without copy-assignment	3 years ago
fixedsizearray.hpp	Codechange: Replace assert_compile macro with static_assert	4 years ago
getoptdata.cpp	Cleanup: Removed SVN headers	5 years ago
getoptdata.h	Cleanup: Removed SVN headers	5 years ago
hashtable.hpp	Codechange: use "[[maybe_unused]]" instead of a wide variety of other ways we had	3 years ago
lrucache.hpp	Cleanup: Remove svn-style `$Id$` comments. (#10122)	2 years ago