[llvm-branch-commits] [llvm-branch] r195114 - Merging r195100:

[Bill Wendling]

Author: void
Date: Tue Nov 19 00:39:18 2013
New Revision: 195114

URL: http://llvm.org/viewvc/llvm-project?rev=195114&view=rev
Log:
Merging r195100:
------------------------------------------------------------------------
r195100 | djasper | 2013-11-18 20:26:05 -0800 (Mon, 18 Nov 2013) | 6 lines

Add .clang-format without column limit to subdirectory tests/.

A column limit in the test folder can lead to trouble as the RUN, CHECK,
etc. comments can potentially be broken over multiple lines changing
their meaning. Without column limit, clang-format will simply keep the
test author's line breaks.
------------------------------------------------------------------------

Added:
    llvm/branches/release_34/test/.clang-format
      - copied unchanged from r195100, llvm/trunk/test/.clang-format
Modified:
    llvm/branches/release_34/   (props changed)

Propchange: llvm/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 19 00:39:18 2013
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,195092-195094
+/llvm/trunk:155241,195092-195094,195100