[llvm-branch-commits] [cfe-branch] r157322 - in /cfe/branches/tooling: ./ test/SemaCXX/warn-unreachable.cpp

[Manuel Klimek]

Author: klimek
Date: Wed May 23 08:26:59 2012
New Revision: 157322

URL: http://llvm.org/viewvc/llvm-project?rev=157322&view=rev
Log:
Merging mainline.


Modified:
    cfe/branches/tooling/   (props changed)
    cfe/branches/tooling/test/SemaCXX/warn-unreachable.cpp   (props changed)

Propchange: cfe/branches/tooling/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 23 08:26:59 2012
@@ -1,3 +1,3 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:146581-157315
+/cfe/trunk:146581-157321
 /cfe/trunk/test/SemaTemplate:126920

Propchange: cfe/branches/tooling/test/SemaCXX/warn-unreachable.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 23 08:26:59 2012
@@ -1,2 +1,2 @@
 /cfe/branches/type-system-rewrite/test/SemaCXX/warn-unreachable.cpp:134693-134817
-/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,146581-157315
+/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,146581-157321