[llvm-branch-commits] [llvm-branch] r143226 - /llvm/branches/release_30/

[Bill Wendling]

Author: void
Date: Fri Oct 28 16:08:15 2011
New Revision: 143226

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

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

Propchange: llvm/branches/release_30/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 28 16:08:15 2011
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:142039,142055,142058,142112,142123,142125,142165,142168,142243,142350,142482,142486,142489,142491-142493,142537,142550,142559,142573-142574,142801,142806,142841,142869,142956,142994,142998,143006
+/llvm/trunk:142039,142055,142058,142112,142123,142125,142165,142168,142243,142350,142482,142486,142489,142491-142493,142537,142550,142559,142573-142574,142801,142806,142841,142869,142956,142994,142998,143006,143222