Fix merge conflicts?
This commit is contained in:
commit
f829932ed1
237 changed files with 7841 additions and 2788 deletions
3
.gitmodules
vendored
3
.gitmodules
vendored
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue