mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-04-22 11:18:22 -05:00
Merge branch 'develop' into OpenSpaceTests
This commit is contained in:
+2
-2
@@ -1,6 +1,6 @@
|
||||
---
|
||||
Language: Cpp
|
||||
AccessModifierOffset: -2
|
||||
AccessModifierOffset: -4
|
||||
AlignEscapedNewlinesLeft: false
|
||||
AlignTrailingComments: true
|
||||
AllowAllParametersOfDeclarationOnNextLine: true
|
||||
@@ -23,7 +23,7 @@ DerivePointerBinding: false
|
||||
IndentCaseLabels: true
|
||||
#Check next
|
||||
IndentFunctionDeclarationAfterType: true
|
||||
IndentWidth: 2
|
||||
IndentWidth: 4
|
||||
MaxEmptyLinesToKeep: 1
|
||||
NamespaceIndentation: None
|
||||
PenaltyBreakBeforeFirstCallParameter: 19
|
||||
|
||||
Reference in New Issue
Block a user