Merge branch 'bc/hash-algo' into next

diff --git a/.clang-format b/.clang-format
index 611ab4750bd21e77d0fec41c8b2e115574c692ff..12a89f95f993546888410613458c9385b16f0108 100644 (file)
--- a/.clang-format
+++ b/.clang-format
@@ -163,7 +163,7 @@ PenaltyBreakComment: 10
 PenaltyBreakFirstLessLess: 0
 PenaltyBreakString: 10
 PenaltyExcessCharacter: 100
-PenaltyReturnTypeOnItsOwnLine: 5
+PenaltyReturnTypeOnItsOwnLine: 60
 
 # Don't sort #include's
 SortIncludes: false