From ca5de70b2b9b88b80e3c034bcfcc56c13632bf18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= <mail@kkaefer.com>
Date: Thu, 10 Apr 2014 14:29:24 -0400
Subject: update clang-format

---
 .clang-format | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to '.clang-format')

diff --git a/.clang-format b/.clang-format
index 3557822cbd..0565d7379e 100644
--- a/.clang-format
+++ b/.clang-format
@@ -3,7 +3,6 @@ IndentWidth: 4
 AccessModifierOffset: -4
 UseTab: Never
 BinPackParameters: true
-AllowShortFunctionsOnASingleLine: false
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
@@ -12,8 +11,6 @@ NamespaceIndentation: None
 PointerBindsToType: false
 SpacesInParentheses: false
 BreakBeforeBraces: Attach
-ColumnLimit: 80
+ColumnLimit: 100
 Cpp11BracedListStyle: true
-SpaceBeforeParens: ControlStatements
 SpacesBeforeTrailingComments: 1
-SpacesInContainerLiterals: true
-- 
cgit v1.2.1