commit e336804cd300977665d911c570066d79c478e13c
author Christopher Ferris <cferris@google.com> Tue Mar 28 21:20:16 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 28 21:20:17 2017 +0000
tree 54b506121734304383483541f0ebfbb7282357f7
parent 23de3c225f61ce6399fd9b4b1fb211f751913067
parent b169b29c366f8f088a6128c7f49309acc3019be7

Merge "Only allow short functions in class definitions."

.clang-format-2

diff --git a/.clang-format-2 b/.clang-format-2
index aab4665..41591ce 100644
--- a/.clang-format-2
+++ b/.clang-format-2
@@ -1,4 +1,5 @@
 BasedOnStyle: Google
+AllowShortFunctionsOnASingleLine: Inline
 ColumnLimit: 100
 CommentPragmas: NOLINT:.*
 DerivePointerAlignment: false

.clang-format-4

diff --git a/.clang-format-4 b/.clang-format-4
index 1497447..ae4a451 100644
--- a/.clang-format-4
+++ b/.clang-format-4
@@ -1,5 +1,6 @@
 BasedOnStyle: Google
 AccessModifierOffset: -2
+AllowShortFunctionsOnASingleLine: Inline
 ColumnLimit: 100
 CommentPragmas: NOLINT:.*
 DerivePointerAlignment: false