Merge "Fix clang-format-11 brace wrapping rule" into devel/master

diff --git a/.clang-format b/.clang-format
index 7d18b03..7fdaf1a 100644 (file)
--- a/.clang-format
+++ b/.clang-format
@@ -30,8 +30,8 @@ BraceWrapping:
   AfterStruct:     true
   AfterUnion:      true
   AfterExternBlock: false
-  BeforeCatch:     false
-  BeforeElse:      false
+  BeforeCatch:     true
+  BeforeElse:      true
   IndentBraces:    false
   SplitEmptyFunction: true
   SplitEmptyRecord: true