mirror of
https://github.com/EttusResearch/uhd.git
synced 2026-10-25 17:36:10 +00:00
Merge branch 'UHD-3.9.LTS' into maint
Conflicts: .gitmodules
This commit is contained in:
commit
7c8284a58d
2
.gitmodules
vendored
2
.gitmodules
vendored
@ -1,4 +1,4 @@
|
||||
[submodule "fpga-src"]
|
||||
path = fpga-src
|
||||
url = https://github.com/EttusResearch/fpga.git
|
||||
branch = master
|
||||
branch = maint
|
||||
|
||||
Loading…
Reference in New Issue
Block a user