diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-25 09:48:15 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-25 09:48:15 +0100 |
| commit | 25af4b266ca48b183a1ad375856396f67d6ab30f (patch) | |
| tree | 64e031ec3747ab706e5ae8ed9fd052e12ee3248b /.gitmodules | |
| parent | ad189cf7d69b8de16244b90d398e1d84ed6d0f4b (diff) | |
| parent | 9b535f6553944f3468bbec9203301623412524ad (diff) | |
| download | px4-firmware-25af4b266ca48b183a1ad375856396f67d6ab30f.tar.gz px4-firmware-25af4b266ca48b183a1ad375856396f67d6ab30f.tar.bz2 px4-firmware-25af4b266ca48b183a1ad375856396f67d6ab30f.zip | |
Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
.gitignore
src/lib/uavcan
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 4996b274b..577181281 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,7 +5,7 @@ path = NuttX url = git://github.com/PX4/NuttX.git [submodule "uavcan"] - path = uavcan + path = src/lib/uavcan url = git://github.com/pavel-kirienko/uavcan.git [submodule "Tools/genmsg"] path = Tools/genmsg @@ -13,3 +13,6 @@ [submodule "Tools/gencpp"] path = Tools/gencpp url = https://github.com/ros/gencpp.git +[submodule "src/lib/uavcan"] + path = src/lib/uavcan + url = git://github.com/pavel-kirienko/uavcan.git |