Merge remote-tracking branch 'px4/master' into beta

2026-05-20 08:19:05 +08:00 · 2014-02-27 17:30:15 +01:00 · 2014-02-27 17:30:15 +01:00 · 680f2dd417
commit 680f2dd417
parent a79eef05bc 9b6f08dc7e
5 changed files with 21 additions and 42 deletions
--- a/Tools/fix_code_style.sh
+++ b/Tools/fix_code_style.sh
@ -16,4 +16,5 @@ astyle \
    --ignore-exclude-errors-x	\
    --lineend=linux		\
    --exclude=EASTL		\
+    --add-brackets \
    $*
--- a/Tools/fix_code_style_ubuntu.sh
+++ b/Tools/fix_code_style_ubuntu.sh
@ -1,19 +0,0 @@
-#!/bin/sh
-astyle \
-    --style=linux		\
-    --indent=force-tab=8	\
-    --indent-cases		\
-    --indent-preprocessor	\
-    --break-blocks=all		\
-    --pad-oper			\
-    --pad-header		\
-    --unpad-paren		\
-    --keep-one-line-blocks	\
-    --keep-one-line-statements	\
-    --align-pointer=name	\
-    --suffix=none		\
-    --lineend=linux		\
-    $*
-    #--ignore-exclude-errors-x	\
-    #--exclude=EASTL		\
-    #--align-reference=name	\