Merge branch 'jgrpp' into jgrpp-nrt

# Conflicts: # .ottdrev-vc # README.md # jgrpp-changelog.md # src/ship_cmd.cpp
2019-08-24 10:41:08 +01:00
parent 7ed86e7488 12be6fd81f
commit 04ef407ddf
48 changed files with 568 additions and 81 deletions
--- a/source.list
+++ b/source.list
@@ -460,6 +460,7 @@ core/alloc_type.hpp
 core/backup_type.hpp
 core/bitmath_func.cpp
 core/bitmath_func.hpp
+core/checksum_func.hpp
 core/container_func.hpp
 core/dyn_arena_alloc.hpp
 core/endian_func.hpp