From 0497bb5528f62f9e3db887988f0f93b4a1653a42 Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Mon, 30 Jul 2018 22:04:51 -0400 Subject: Fix merge conflicts with opus and update docs --- .gitmodules | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to '.gitmodules') 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 -- cgit v1.2.3