diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-08-12 17:55:44 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-08-12 17:55:44 -0700 |
| commit | 7c8284a58d4feaccedbcb45472ecb939eea95888 (patch) | |
| tree | f8649605d95bc1115e963c5f361a3c7da692c5cc | |
| parent | 73ea894be3f234c63399076148cf4f1f018ea9e2 (diff) | |
| parent | ef2fa561b51b36bb12df7fb6264545a9be053cec (diff) | |
| download | uhd-7c8284a58d4feaccedbcb45472ecb939eea95888.tar.gz uhd-7c8284a58d4feaccedbcb45472ecb939eea95888.tar.bz2 uhd-7c8284a58d4feaccedbcb45472ecb939eea95888.zip | |
Merge branch 'UHD-3.9.LTS' into maint
Conflicts:
.gitmodules
| -rw-r--r-- | .gitmodules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index c85c089b3..473a21289 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "fpga-src"] path = fpga-src url = https://github.com/EttusResearch/fpga.git - branch = master + branch = maint |