Manually fixup merge botches via direct comparison with NuttX r5447.

This commit is contained in:
px4dev
2013-01-11 02:14:43 -08:00
parent 48c5d63319
commit f127495caa
428 changed files with 13932 additions and 3888 deletions
+3
View File
@@ -70,6 +70,9 @@ while [ ! -z "$1" ]; do
echo " header file paths."
echo " -d"
echo " Enable script debug"
echo " -h"
echo " Shows this help text and exits."
exit 0
;;
* )
break;