[llvm-branch-commits] [cfe-branch] r155114 - /cfe/branches/tooling/tools/clang-check/Makefile

[Manuel Klimek]

Author: klimek
Date: Thu Apr 19 05:04:59 2012
New Revision: 155114

URL: http://llvm.org/viewvc/llvm-project?rev=155114&view=rev
Log:
Another tree conflict merge.

Added:
    cfe/branches/tooling/tools/clang-check/Makefile   (props changed)
      - copied unchanged from r155113, cfe/trunk/tools/clang-check/Makefile

Propchange: cfe/branches/tooling/tools/clang-check/Makefile
------------------------------------------------------------------------------
    svn:eol-style = LF

Propchange: cfe/branches/tooling/tools/clang-check/Makefile
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Apr 19 05:04:59 2012
@@ -0,0 +1,2 @@
+/cfe/branches/type-system-rewrite/tools/clang-check/Makefile:134693-134817
+/cfe/trunk/test/SemaTemplate/tools/clang-check/Makefile:126920