Merge branch 'develop' into OpenSpaceTests

This commit is contained in:
Jonas Strandstedt
2014-04-01 17:18:50 -04:00
+2 -2
View File
@@ -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