aboutsummaryrefslogtreecommitdiff
path: root/src/.clang-format
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2017-01-28 16:58:29 +0100
committerMarcoFalke <falke.marco@gmail.com>2017-01-28 16:57:08 +0100
commitfa5137c11d2d4accd9bfc68b3498e7e16829c3ab (patch)
treea712302f90b56aef5f25ce086c10f1dd645f2fb1 /src/.clang-format
parenta7ea2f8fdbe9392bcbd4a219a42ebd9518d2e2ef (diff)
[doc] Remove unused clang format dev script
Also, update the clang format file to reflect the current coding style mentioned in the developer notes.
Diffstat (limited to 'src/.clang-format')
-rw-r--r--src/.clang-format2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/.clang-format b/src/.clang-format
index 129f062ef8..fc53509138 100644
--- a/src/.clang-format
+++ b/src/.clang-format
@@ -6,7 +6,7 @@ AlignTrailingComments: true
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: false
AllowShortFunctionsOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: true
AllowShortLoopsOnASingleLine: false
AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: true