Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-24 07:09:48 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev_ros

Browse Source 
Conflicts:
	.gitignore
	src/lib/uavcan
This commit is contained in:
Thomas Gubler
2014-12-25 09:48:15 +01:00
parent ad189cf7d6 9b535f6553
commit 25af4b266c
65 changed files with 21014 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitmodules
+4 -1
View File
@@ -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