aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-07-07 17:21:20 +0200
committerLorenz Meier <lm@inf.ethz.ch>2014-07-07 17:21:20 +0200
commit32511009470c6d8c08546d2eb016a75d52512a98 (patch)
tree726d0aae32c68dc254ffeab821a3dcb2c5cd5619
parent9886bb8ca09dbf8a4b7fdd22e6d2dec9f9854eb9 (diff)
parent6c5c6ba9ee6cfff9ea748f812902922a5c7addba (diff)
downloadpx4-firmware-32511009470c6d8c08546d2eb016a75d52512a98.tar.gz
px4-firmware-32511009470c6d8c08546d2eb016a75d52512a98.tar.bz2
px4-firmware-32511009470c6d8c08546d2eb016a75d52512a98.zip
Added NuttX
-rw-r--r--.gitignore1
-rw-r--r--.gitmodules3
m---------NuttX0
3 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index afd63e06a..8b09e4783 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,7 +29,6 @@ mavlink/include/mavlink/v0.9/
/nuttx-configs/px4io-v1/src/.depend
/nuttx-configs/px4io-v1/src/Make.dep
/nuttx-configs/px4io-v1/src/libboard.a
-/NuttX
/Documentation/doxy.log
/Documentation/html/
/Documentation/doxygen*objdb*tmp
diff --git a/.gitmodules b/.gitmodules
index 937db7cc6..8436b398e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
[submodule "mavlink/include/mavlink/v1.0"]
path = mavlink/include/mavlink/v1.0
url = git://github.com/mavlink/c_library.git
+[submodule "NuttX"]
+ path = NuttX
+ url = git://github.com/PX4/NuttX.git
diff --git a/NuttX b/NuttX
new file mode 160000
+Subproject 2a94cc8e5babb7d5661aedc09201239d3964433