Reverted premature changes to .clang-format

llvm-svn: 279316
2016-08-19 20:46:37 +00:00 · 2016-08-19 20:46:37 +00:00 · b03a71eea8
parent 41de9a9791
commit b03a71eea8
2 changed files with 8 additions and 4 deletions
--- a/lldb/.clang-format
+++ b/lldb/.clang-format
@ -1 +1,9 @@
 BasedOnStyle: LLVM
+IndentWidth:     4
+ColumnLimit:     120
+BreakBeforeBraces: Allman
+AlwaysBreakAfterReturnType: All
+AllowShortFunctionsOnASingleLine: Inline
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+IndentCaseLabels: true
+AccessModifierOffset: -4
--- a/lldb/packages/Python/lldbsuite/.clang-format
+++ b/lldb/packages/Python/lldbsuite/.clang-format
@ -1,4 +0,0 @@
-DisableFormat: true
-
-# Disabling formatting doesn't implicitly disable include sorting
-SortIncludes: false