[llvm-branch-commits] [llvm-branch] r155374 - /llvm/branches/release_31/

[Bill Wendling]

Author: void
Date: Mon Apr 23 13:32:40 2012
New Revision: 155374

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

Modified:
    llvm/branches/release_31/   (props changed)

Propchange: llvm/branches/release_31/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 23 13:32:40 2012
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155230,155284-155285,155307
+/llvm/trunk:155230,155284-155285,155307,155342