Reverted premature changes to .clang-format
authorKate Stone <katherine.stone@apple.com>
Fri, 19 Aug 2016 20:46:37 +0000 (20:46 +0000)
committerKate Stone <katherine.stone@apple.com>
Fri, 19 Aug 2016 20:46:37 +0000 (20:46 +0000)
llvm-svn: 279316

lldb/.clang-format
lldb/packages/Python/lldbsuite/.clang-format [deleted file]

index 9b3aa8b..c698dc5 100644 (file)
@@ -1 +1,9 @@
 BasedOnStyle: LLVM
+IndentWidth:     4
+ColumnLimit:     120
+BreakBeforeBraces: Allman
+AlwaysBreakAfterReturnType: All
+AllowShortFunctionsOnASingleLine: Inline
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+IndentCaseLabels: true
+AccessModifierOffset: -4
diff --git a/lldb/packages/Python/lldbsuite/.clang-format b/lldb/packages/Python/lldbsuite/.clang-format
deleted file mode 100644 (file)
index 7de7a51..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-DisableFormat: true
-
-# Disabling formatting doesn't implicitly disable include sorting
-SortIncludes: false