diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-05 23:39:35 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-05 23:39:48 +0100 |
| commit | 4ee149a6db25cde31432f83369b40c92be13021c (patch) | |
| tree | 9d6dcc5b846e22702fd016327d0701036d75b242 /src | |
| parent | 849a7e645323062878604589df97a1cd75517eb1 (diff) | |
| parent | e167af2acd0bfc428ed3c68303c42c996a8df435 (diff) | |
| download | bitcoin-4ee149a6db25cde31432f83369b40c92be13021c.tar.xz | |
Merge pull request #6955
e167af2 [doc] Remove excessive white space (MarcoFalke)
e0eeb67 [trivial] clang-format: Set AlignAfterOpenBracket: false (MarcoFalke)
0af8fe4 devtools: Update README.md (MarcoFalke)
Diffstat (limited to 'src')
| -rw-r--r-- | src/.clang-format | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/.clang-format b/src/.clang-format index 226a15d185..129f062ef8 100644 --- a/src/.clang-format +++ b/src/.clang-format @@ -1,4 +1,6 @@ +Language: Cpp AccessModifierOffset: -4 +AlignAfterOpenBracket: false AlignEscapedNewlinesLeft: true AlignTrailingComments: true AllowAllParametersOfDeclarationOnNextLine: false @@ -26,7 +28,6 @@ IndentCaseLabels: false IndentFunctionDeclarationAfterType: false IndentWidth: 4 KeepEmptyLinesAtTheStartOfBlocks: false -Language: Cpp MaxEmptyLinesToKeep: 2 NamespaceIndentation: None ObjCSpaceAfterProperty: false |