diff options
author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-10-09 11:32:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-09 11:32:06 +0200 |
commit | 17016090e38cc44e58517129278c28dd7943b4cc (patch) | |
tree | a0ba6d0628f333c28b2e584cc6eb6d1ef413aa07 /.clang-format | |
parent | e6e5fa3bf8853f149fdef16b39af3981097176a4 (diff) | |
download | minetest-17016090e38cc44e58517129278c28dd7943b4cc.tar.gz minetest-17016090e38cc44e58517129278c28dd7943b4cc.tar.bz2 minetest-17016090e38cc44e58517129278c28dd7943b4cc.zip |
Travis: Update clang from 4.0 to 5.0 (#6467)
* Update clang from 4.0 to 5.0
Diffstat (limited to '.clang-format')
-rw-r--r-- | .clang-format | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.clang-format b/.clang-format index f1d51a04f..455dc6038 100644 --- a/.clang-format +++ b/.clang-format @@ -17,7 +17,7 @@ AllowShortIfStatementsOnASingleLine: false IndentCaseLabels: false AccessModifierOffset: -8 ColumnLimit: 90 -AllowShortFunctionsOnASingleLine: Inline +AllowShortFunctionsOnASingleLine: InlineOnly SortIncludes: false IncludeCategories: - Regex: '^".*' @@ -26,3 +26,5 @@ IncludeCategories: Priority: 1 AlignAfterOpenBracket: DontAlign ContinuationIndentWidth: 16 +ConstructorInitializerIndentWidth: 16 +BreakConstructorInitializers: AfterColon |