[llvm-branch-commits] [llvm-branch] r215874 - Merging r215806:

[Bill Wendling]

Author: void
Date: Mon Aug 18 00:14:39 2014
New Revision: 215874

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

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

Propchange: llvm/branches/release_35/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 18 00:14:39 2014
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,213653,213665,213726,213749,213773,213793,213798-213799,213815,213847,213880,213883-213884,213894-213896,213899,213915,213966,213999,214060,214129,214180,214287,214331,214423,214429,214519,214670,214674,214679
+/llvm/trunk:155241,213653,213665,213726,213749,213773,213793,213798-213799,213815,213847,213880,213883-213884,213894-213896,213899,213915,213966,213999,214060,214129,214180,214287,214331,214423,214429,214519,214670,214674,214679,215806