From e5a5104e27e8707bc274ae4d3eb20bbc11b86a84 Mon Sep 17 00:00:00 2001
From: Kate Stone <katherine.stone@apple.com>
Date: Tue, 6 Sep 2016 17:19:00 +0000
Subject: [PATCH] Updated .clang-format rules so bring LLDB in line with LLVM
 standards.

llvm-svn: 280721
---
 lldb/.clang-format                           | 8 --------
 lldb/packages/Python/lldbsuite/.clang-format | 4 ++++
 2 files changed, 4 insertions(+), 8 deletions(-)
 create mode 100644 lldb/packages/Python/lldbsuite/.clang-format

diff --git a/lldb/.clang-format b/lldb/.clang-format
index c698dc5d99cf..9b3aa8b7213b 100644
--- a/lldb/.clang-format
+++ b/lldb/.clang-format
@@ -1,9 +1 @@
 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
new file mode 100644
index 000000000000..7de7a512ad7e
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/.clang-format
@@ -0,0 +1,4 @@
+DisableFormat: true
+
+# Disabling formatting doesn't implicitly disable include sorting
+SortIncludes: false