Merge branch 'main' into file_formats

This commit is contained in:
georgemoralis 2024-02-28 19:10:19 +02:00
commit 5a0ae86a71
6 changed files with 23 additions and 0 deletions

18
.gitmodules vendored
View file

@ -37,3 +37,21 @@
path = externals/discord-rpc
url = https://github.com/shadps4-emu/ext-discord-rpc.git
branch = master
[submodule "externals/cryptopp-cmake"]
path = externals/cryptopp-cmake
url = https://github.com/shadps4-emu/ext-cryptopp-cmake.git
branch = master
[submodule "externals/cryptopp"]
path = externals/cryptopp
url = https://github.com/shadps4-emu/ext-cryptopp.git
branch = master
[submodule "externals/cryptoppwin"]
path = externals/cryptoppwin
url = https://github.com/shadps4-emu/ext-cryptoppwin.git
branch = main
[submodule "externals/zlib-ng"]
path = externals/zlib-ng
url = https://github.com/shadps4-emu/ext-zlib-ng.git
[submodule "externals/zlib-ng-win"]
path = externals/zlib-ng-win
url = https://github.com/shadps4-emu/ext-zlib-ng-win.git

1
externals/cryptopp vendored Submodule

@ -0,0 +1 @@
Subproject commit 782057f5f18fbdad2bd2b291fb1ec558a8ab8225

1
externals/cryptopp-cmake vendored Submodule

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

1
externals/cryptoppwin vendored Submodule

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

1
externals/zlib-ng vendored Submodule

@ -0,0 +1 @@
Subproject commit 3ac71d9e2f860ac3634b43a99892255eb39179cf

1
externals/zlib-ng-win vendored Submodule

@ -0,0 +1 @@
Subproject commit 6ad2df3e3c2e58c009f70936a8c510b939bca1d9