diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-08-20 06:29:21 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-08-20 06:29:21 +0300 |
| commit | 3a4720d1f523ca8ebee0d963604c236c08980eae (patch) | |
| tree | ff5c6adb045d104aa3cce6c6c68e63e3c55659cb /.clang-format | |
| parent | 34c13264f33d9bbfc73302b84c8fade1b115fb93 (diff) | |
| parent | 169599fd2f211d66f80a54e13daf975229607022 (diff) | |
Merge branch 'develop' into marchcat/b-develop
# Conflicts:
# .github/workflows/build.yaml
# autobuild.xml
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FreeType.cmake
# indra/newview/llappviewer.cpp
# indra/newview/skins/default/xui/en/floater_fast_timers.xml
# indra/newview/viewer_manifest.py
# indra/test/test.cpp
Diffstat (limited to '.clang-format')
| -rw-r--r-- | .clang-format | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.clang-format b/.clang-format index ee8a8a8c92..90124fb04b 100644 --- a/.clang-format +++ b/.clang-format @@ -40,7 +40,7 @@ CompactNamespaces: false ConstructorInitializerAllOnOneLineOrOnePerLine: true ConstructorInitializerIndentWidth: 4 ContinuationIndentWidth: 4 -Cpp11BracedListStyle: true +Cpp11BracedListStyle: false DeriveLineEnding: true DerivePointerAlignment: false DisableFormat: false @@ -87,7 +87,7 @@ PenaltyBreakString: 1000 PenaltyBreakTemplateDeclaration: 10 PenaltyExcessCharacter: 1000000 PenaltyReturnTypeOnItsOwnLine: 1000 -PointerAlignment: Right +PointerAlignment: Left ReflowComments: true SortIncludes: false SortUsingDeclarations: true @@ -95,7 +95,7 @@ SpaceAfterCStyleCast: true SpaceAfterLogicalNot: false SpaceAfterTemplateKeyword: true SpaceBeforeAssignmentOperators: true -SpaceBeforeCpp11BracedList: true +SpaceBeforeCpp11BracedList: false SpaceBeforeCtorInitializerColon: true SpaceBeforeInheritanceColon: true SpaceBeforeParens: ControlStatements |