commit a354494ba08cfefc0700e061fce7b05a399a5087
author Christopher Ferris <cferris@google.com> Fri Mar 10 22:46:29 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 10 22:46:29 2017 +0000
tree 734ccfdebb25d22b72833dc6c1011cf626183f98
parent 49721574f4a054737f545cba0ff7b6d1663db03d
parent d7ec37b3cb6e671d2b7704cc3b5f95395a6f7bfc

Merge "Add a 2 width option of clang format."

.clang-format

diff --git a/.clang-format b/.clang-format
new file mode 120000
index 0000000..9b45e0a
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1 @@
+.clang-format-4
\ No newline at end of file

.clang-format-2

diff --git a/.clang-format-2 b/.clang-format-2
new file mode 100644
index 0000000..fb967d8
--- /dev/null
+++ b/.clang-format-2
@@ -0,0 +1,13 @@
+BasedOnStyle: Google
+AllowShortBlocksOnASingleLine: false
+AllowShortFunctionsOnASingleLine: true
+
+AccessModifierOffset: -1
+ColumnLimit: 100
+CommentPragmas: NOLINT:.*
+DerivePointerAlignment: false
+IndentWidth: 2
+PointerAlignment: Left
+TabWidth: 2
+UseTab: Never
+PenaltyExcessCharacter: 32

.clang-format-4

diff --git a/.clang-format b/.clang-format-4
similarity index 100%
rename from .clang-format
rename to .clang-format-4

libbacktrace/.clang-format

diff --git a/libbacktrace/.clang-format b/libbacktrace/.clang-format
new file mode 120000
index 0000000..fd0645f
--- /dev/null
+++ b/libbacktrace/.clang-format
@@ -0,0 +1 @@
+../.clang-format-2
\ No newline at end of file