Merge branch 'master' of pixhawk.ethz.ch:qgroundcontrol

dao95 · Oct 27, 2010 · 3ad00a0 · 3ad00a0
2 parents 6641fca + 15caabd
commit 3ad00a0
Show file tree

Hide file tree

Showing 78 changed files with 4,272 additions and 1,323 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,3 +24,4 @@ doc/doxy.log
 deploy/mac
 deploy/linux
 controller_log*
+user_config.pri