diff options
| author |  Ameer | 2020-07-04 00:59:40 -0400 |
|---|---|---|
| committer | Ameer | 2020-07-04 00:59:40 -0400 |
| commit | f829932ed191ad469df01342191bf2725e8a20bb (patch) | |
| tree | 0ae185ce3ef43ef9b085aae7b9ad5abb04e3d239 /.gitmodules | |
| parent | Fix for always firing triggers on some controllers, trigger threshold more un... (diff) | |
| parent | Merge pull request #4218 from ogniK5377/opus-external (diff) | |
| download | yuzu-f829932ed191ad469df01342191bf2725e8a20bb.tar.gz yuzu-f829932ed191ad469df01342191bf2725e8a20bb.tar.xz yuzu-f829932ed191ad469df01342191bf2725e8a20bb.zip | |
Fix merge conflicts?
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index e3ec628ea..79028bbb5 100644 --- a/.gitmodules +++ b/.gitmodules | |||
| @@ -37,3 +37,6 @@ | |||
| 37 | [submodule "externals/libusb"] | 37 | [submodule "externals/libusb"] |
| 38 | path = externals/libusb | 38 | path = externals/libusb |
| 39 | url = https://github.com/ameerj/libusb | 39 | url = https://github.com/ameerj/libusb |
| 40 | [submodule "opus"] | ||
| 41 | path = externals/opus/opus | ||
| 42 | url = https://github.com/xiph/opus.git | ||