Merge branch 'UHD-3.9.LTS' into maint

Conflicts:
	.gitmodules
This commit is contained in:
Martin Braun 2016-08-12 17:55:44 -07:00
commit 7c8284a58d

2
.gitmodules vendored
View File

@ -1,4 +1,4 @@
[submodule "fpga-src"]
path = fpga-src
url = https://github.com/EttusResearch/fpga.git
branch = master
branch = maint