diff options
| author | Martin Braun <martin.braun@ettus.com> | 2014-12-16 12:47:19 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2014-12-16 12:47:19 +0100 |
| commit | c2c2ecfad41a37655277d42cbed103c7f952852a (patch) | |
| tree | b42e6238a5bdb4106646bcd0c98cca3c5bc05238 /.gitmodules | |
| parent | bb10b51c21ed7e116e4be5b11a256eefb60d7903 (diff) | |
| parent | 2474ac3296142aa333c09c0215d6fb80c446f20e (diff) | |
| download | uhd-c2c2ecfad41a37655277d42cbed103c7f952852a.tar.gz uhd-c2c2ecfad41a37655277d42cbed103c7f952852a.tar.bz2 uhd-c2c2ecfad41a37655277d42cbed103c7f952852a.zip | |
Merge branch 'maint'
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 9d81e6973..793f1aae5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "fpga-src"] path = fpga-src url = git@github.com:EttusResearch/fpga.git - branch = master + branch = maint |