diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-27 21:17:16 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-27 21:17:16 +0200 |
| commit | 8cc15c036dbc5fefb025eb957f4d312d41659163 (patch) | |
| tree | 6c4d67d677e6bb9bc90b7e3f08d18c8a798680b6 /.clang-format | |
| parent | cc28947315887f55814cb8bc4e68d4e2fe6c65e6 (diff) | |
| parent | b86e0f25f896285a34c999515ad50e50d879f3e7 (diff) | |
| download | mariadb-git-8cc15c036dbc5fefb025eb957f4d312d41659163.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to '.clang-format')
| -rw-r--r-- | .clang-format | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.clang-format b/.clang-format index 7ad3d0dbddc..7ce45951173 100644 --- a/.clang-format +++ b/.clang-format @@ -85,7 +85,7 @@ PenaltyExcessCharacter: 1000000 PenaltyReturnTypeOnItsOwnLine: 60 PointerAlignment: Right ReflowComments: true -SortIncludes: true +SortIncludes: false SortUsingDeclarations: true SpaceAfterCStyleCast: true SpaceAfterTemplateKeyword: true |