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

2022-11-05 19:24:44 +00:00

..

array.hpp

Codechange: Replace CStrA with std::string

2021-04-04 08:01:54 +01:00

binaryheap.hpp

Fix: Globally apply preprocessor directive coding style

2020-07-03 09:08:46 +02:00

CMakeLists.txt

Change: [Network] Transfer command data as serialized byte stream without fixed structure.

2021-12-16 22:28:32 +01:00

countedobj.cpp

Cleanup: Removed SVN headers

2019-11-10 17:59:20 +00:00

countedptr.hpp

Cleanup: Removed SVN headers

2019-11-10 17:59:20 +00:00

dbg_helpers.cpp

Cleanup: Delete remaining Blob code

2021-04-04 08:01:54 +01:00

dbg_helpers.h

Cleanup: remove unused copy-constructor without copy-assignment

2021-05-27 18:30:56 +02:00

fixedsizearray.hpp

Codechange: Replace assert_compile macro with static_assert

2020-12-27 10:55:42 +00:00

getoptdata.cpp

Cleanup: Removed SVN headers

2019-11-10 17:59:20 +00:00

getoptdata.h

Cleanup: Removed SVN headers

2019-11-10 17:59:20 +00:00

hashtable.hpp

Codechange: use "[[maybe_unused]]" instead of a wide variety of other ways we had

2021-06-03 17:30:00 +02:00

lrucache.hpp

Cleanup: Remove svn-style $Id$ comments. (#10122)

2022-11-01 18:24:31 -06:00