submodule fix after merge

This commit is contained in:
Thomas Winget 2022-07-14 17:02:30 -04:00
parent 1311a20e9f
commit b3a3461f92
6 changed files with 3 additions and 11 deletions

3
.gitmodules vendored
View File

@ -40,9 +40,6 @@
[submodule "external/date"]
path = external/date
url = https://github.com/HowardHinnant/date.git
[submodule "external/fmt"]
path = external/fmt
url = https://github.com/fmtlib/fmt.git
[submodule "external/oxen-encoding"]
path = external/oxen-encoding
url = https://github.com/oxen-io/oxen-encoding.git

View File

@ -63,10 +63,6 @@ system_or_submodule(OXENC oxenc liboxenc>=1.0.3 oxen-encoding)
system_or_submodule(OXENMQ oxenmq liboxenmq>=1.2.12 oxen-mq)
system_or_submodule(FMT fmt fmt>=8.0.0 fmt)
system_or_submodule(OXENC oxenc liboxenc>=1.0.3 oxen-encoding)
system_or_submodule(OXENMQ oxenmq liboxenmq>=1.2.12 oxen-mq)
system_or_submodule(FMT fmt fmt>=8.0.0 fmt)
add_subdirectory(db_drivers)
add_subdirectory(easylogging++ easyloggingpp)
add_subdirectory(randomx EXCLUDE_FROM_ALL)

2
external/cpr vendored

@ -1 +1 @@
Subproject commit aac5058a15e9ad5ad393973dc6fe44d7614a7f55
Subproject commit beb9e98806bb84bcc130a2cebfbcbbc6ce62b335

@ -1 +1 @@
Subproject commit a0912ab4bf3b5e83b42715eff6f632c8912b21e4
Subproject commit 79193e58fb26624d40cd2e95156f78160f2b9b3e

1
external/oxenc vendored

@ -1 +0,0 @@
Subproject commit a0912ab4bf3b5e83b42715eff6f632c8912b21e4

@ -1 +1 @@
Subproject commit b7c82d791010bd4c9b45528846f95b9886e9f984
Subproject commit eea4b7e0f6e907646d34909e32f415c2a7dea385