dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/3rdparty/monocypher/CHANGELOG.md
#	src/3rdparty/monocypher/CMakeLists.txt
#	src/3rdparty/monocypher/README.md
#	src/3rdparty/monocypher/monocypher.h
#	src/core/random_func.cpp
#	src/misc.cpp
This commit is contained in:
Jonathan G Rennison
2024-02-06 18:10:16 +00:00
parent 347862504f bd85f61a40
commit 2208d70e33
13 changed files with 855 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@@ -587,6 +587,9 @@ See `src/3rdparty/catch2/LICENSE.txt` for the complete license text.
The icu scriptrun implementation in `src/3rdparty/icu` is licensed under the Unicode license.
See `src/3rdparty/icu/LICENSE` for the complete license text.
The monocypher implementation in `src/3rdparty/monocypher` is licensed under the 2-clause BSD and CC-0 license.
See src/3rdparty/monocypher/LICENSE.md` for the complete license text.
## 4.0 Credits
See [CREDITS.md](./CREDITS.md)