summaryrefslogtreecommitdiff
path: root/.gitmodules
diff options
context:
space:
mode:
authorZach Hilman <zachhilman@gmail.com>2018-07-30 22:04:51 -0400
committerZach Hilman <zachhilman@gmail.com>2018-08-01 00:16:54 -0400
commit0497bb5528f62f9e3db887988f0f93b4a1653a42 (patch)
treec4f868272fb46e075e2e2c3f50504965dcf68796 /.gitmodules
parent187d8e215fb157edaa9f3976bebba9a9a7ed103d (diff)
Fix merge conflicts with opus and update docs
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules10
1 files changed, 5 insertions, 5 deletions
diff --git a/.gitmodules b/.gitmodules
index 247aac535..4f4e8690b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,9 +25,9 @@
[submodule "unicorn"]
path = externals/unicorn
url = https://github.com/yuzu-emu/unicorn
-[submodule "externals/mbedtls"]
- path = externals/mbedtls
- url = https://github.com/DarkLordZach/mbedtls
+[submodule "mbedtls"]
+ path = externals/mbedtls
+ url = https://github.com/DarkLordZach/mbedtls
[submodule "opus"]
- path = externals/opus
- url = https://github.com/ogniK5377/opus.git
+ path = externals/opus
+ url = https://github.com/ogniK5377/opus.git