[llvm-branch-commits] [llvm-branch] r214764 - Merging r214060:

[Bill Wendling]

Author: void
Date: Mon Aug  4 14:58:16 2014
New Revision: 214764

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

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

Propchange: llvm/branches/release_35/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug  4 14:58:16 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,213815,213847,213880,213883-213884,213894-213896,213899,213915,213966,213999,214129,214180,214287,214331,214423,214429,214519
+/llvm/trunk:155241,213653,213665,213726,213749,213773,213793,213798,213815,213847,213880,213883-213884,213894-213896,213899,213915,213966,213999,214060,214129,214180,214287,214331,214423,214429,214519