Merge remote-tracking branch 'origin/master' into feature/custom-ifp-animations

jushar · jushar · commit 44e8167e15fe · 2018-06-16T17:28:33.000+02:00
diff --git a/.clang-format b/.clang-format
@@ -51,7 +51,7 @@ ConstructorInitializerAllOnOneLineOrOnePerLine: true
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: true
-DerivePointerAlignment: true
+DerivePointerAlignment: false
 DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
 FixNamespaceComments: true
