diff options
| author | Julian Oes <julian@oes.ch> | 2014-02-27 17:30:15 +0100 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-02-27 17:30:15 +0100 |
| commit | 680f2dd4172bd31eb415f1fa85c4c1bb2b2b509f (patch) | |
| tree | 300ea81cb233b714864173b5425308ff82dced50 /Tools | |
| parent | a79eef05bcb23c9be386a2980437a67151cfa3ea (diff) | |
| parent | 9b6f08dc7eefb2e4a055b1d89a0cec0022299ff9 (diff) | |
| download | px4-firmware-680f2dd4172bd31eb415f1fa85c4c1bb2b2b509f.tar.gz px4-firmware-680f2dd4172bd31eb415f1fa85c4c1bb2b2b509f.tar.bz2 px4-firmware-680f2dd4172bd31eb415f1fa85c4c1bb2b2b509f.zip | |
Merge remote-tracking branch 'px4/master' into beta
Diffstat (limited to 'Tools')
| -rwxr-xr-x | Tools/fix_code_style.sh | 1 | ||||
| -rwxr-xr-x | Tools/fix_code_style_ubuntu.sh | 19 |
2 files changed, 1 insertions, 19 deletions
diff --git a/Tools/fix_code_style.sh b/Tools/fix_code_style.sh index 832ee79da..0b6743013 100755 --- 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 \ $* diff --git a/Tools/fix_code_style_ubuntu.sh b/Tools/fix_code_style_ubuntu.sh deleted file mode 100755 index 90ab57b89..000000000 --- a/Tools/fix_code_style_ubuntu.sh +++ /dev/null @@ -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 \ |