Fix merge conflicts?
This commit is contained in:
commit
f829932ed1
237 files changed
+7838
-2785
No files matched your search
@@ -37,3 +37,6 @@
|
||||
[submodule "externals/libusb"]
|
||||
path = externals/libusb
|
||||
url = https://github.com/ameerj/libusb
|
||||
[submodule "opus"]
|
||||
path = externals/opus/opus
|
||||
url = https://github.com/xiph/opus.git
|
||||
Reference in new issue
Block a user