diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-01-27 09:10:05 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-01-27 09:10:05 +0100 |
| commit | 5047677c784077be82d11be26277260e6350a5bc (patch) | |
| tree | 1bdfb03388f481160b1b5c59b828b132c680cf25 | |
| parent | 91ae742f513515f88484f281c52414cd7ec78721 (diff) | |
| parent | fd8ccc869ae4f61f1171c894954d980aea57d4aa (diff) | |
| download | uhd-5047677c784077be82d11be26277260e6350a5bc.tar.gz uhd-5047677c784077be82d11be26277260e6350a5bc.tar.bz2 uhd-5047677c784077be82d11be26277260e6350a5bc.zip | |
Merge branch 'maint'
Conflicts:
.gitmodules
| -rw-r--r-- | .gitmodules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 9d81e6973..c85c089b3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "fpga-src"] path = fpga-src - url = git@github.com:EttusResearch/fpga.git + url = https://github.com/EttusResearch/fpga.git branch = master |