diff options
author | Jason Reiss <jreiss@multitech.com> | 2016-09-21 13:52:59 -0500 |
---|---|---|
committer | Jason Reiss <jreiss@multitech.com> | 2016-09-21 13:52:59 -0500 |
commit | 04b6e95c2931eadee93a6c1fe982f1658a60e1b7 (patch) | |
tree | 84406fd9a31a44d78422003249572f2b104be850 /.gitmodules | |
parent | be0d56b806ce76cef1d5bd5b6795391c2049b8b4 (diff) | |
parent | 692b74778f6b95cf0c668dfdb85f39035e113baa (diff) | |
download | mtdot-box-evb-factory-firmware-04b6e95c2931eadee93a6c1fe982f1658a60e1b7.tar.gz mtdot-box-evb-factory-firmware-04b6e95c2931eadee93a6c1fe982f1658a60e1b7.tar.bz2 mtdot-box-evb-factory-firmware-04b6e95c2931eadee93a6c1fe982f1658a60e1b7.zip |
Merge branch 'Semtech'
Conflicts:
.gitmodules
Mode/ModeJoin.cpp
main.cpp
Add AU915
Diffstat (limited to '.gitmodules')
-rw-r--r-- | .gitmodules | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index ed78bc8..69cfdcd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "mdot-library"] path = mdot-library - url = git@gitlab.multitech.net:/lora-mote/mdot-library.git + url = git@gitlab.multitech.net:lora-mote/mdot-library.git [submodule "libs/MTS-Serial"] path = libs/MTS-Serial - url = git@gitlab.multitech.net:/mbed/MTS-Serial.git + url = git@gitlab.multitech.net:mbed/MTS-Serial.git |