[Lldb-commits] [lldb] r279316 - Reverted premature changes to .clang-format

[Kate Stone via lldb-commits]

Author: kate
Date: Fri Aug 19 15:46:37 2016
New Revision: 279316

URL: http://llvm.org/viewvc/llvm-project?rev=279316&view=rev
Log:
Reverted premature changes to .clang-format


Removed:
    lldb/trunk/packages/Python/lldbsuite/.clang-format
Modified:
    lldb/trunk/.clang-format

Modified: lldb/trunk/.clang-format
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/.clang-format?rev=279316&r1=279315&r2=279316&view=diff
==============================================================================
--- lldb/trunk/.clang-format (original)
+++ lldb/trunk/.clang-format Fri Aug 19 15:46:37 2016
@@ -1 +1,9 @@
 BasedOnStyle: LLVM
+IndentWidth:     4
+ColumnLimit:     120
+BreakBeforeBraces: Allman
+AlwaysBreakAfterReturnType: All
+AllowShortFunctionsOnASingleLine: Inline
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+IndentCaseLabels: true
+AccessModifierOffset: -4

Removed: lldb/trunk/packages/Python/lldbsuite/.clang-format
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/.clang-format?rev=279315&view=auto
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/.clang-format (original)
+++ lldb/trunk/packages/Python/lldbsuite/.clang-format (removed)
@@ -1,4 +0,0 @@
-DisableFormat: true
-
-# Disabling formatting doesn't implicitly disable include sorting
-SortIncludes: false