[sr-dev] git:master:f8d0a395: .clang-format: do not use bleeding edge keys

Module: kamailio Branch: master Commit: f8d0a395074cd066a9f3df26debf14cf26e21a12 URL: https://github.com/kamailio/kamailio/commit/f8d0a395074cd066a9f3df26debf14c… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2017-11-28T00:22:36+02:00 .clang-format: do not use bleeding edge keys --- Modified: .clang-format --- Diff: https://github.com/kamailio/kamailio/commit/f8d0a395074cd066a9f3df26debf14c… Patch: https://github.com/kamailio/kamailio/commit/f8d0a395074cd066a9f3df26debf14c… --- diff --git a/.clang-format b/.clang-format index b44f1c4a54..d805149083 100644 --- a/.clang-format +++ b/.clang-format @@ -36,8 +36,6 @@ BreakBeforeBinaryOperators: NonAssignment BreakBeforeBraces: Mozilla BreakBeforeTernaryOperators: true BreakConstructorInitializersBeforeComma: false -BreakAfterJavaFieldAnnotations: false -BreakStringLiterals: true ColumnLimit: 80 CommentPragmas: '^ IWYU pragma:' ConstructorInitializerAllOnOneLineOrOnePerLine: false @@ -55,12 +53,9 @@ IncludeCategories: Priority: 3 - Regex: '.*' Priority: 1 -IncludeIsMainRegex: '$' IndentCaseLabels: true IndentWidth: 4 IndentWrappedFunctionNames: false -JavaScriptQuotes: Leave -JavaScriptWrapImports: true KeepEmptyLinesAtTheStartOfBlocks: true MacroBlockBegin: '' MacroBlockEnd: ''