[llvm-branch-commits] [cfe-branch] r196015 - Merging r195932:

[Bill Wendling]

Author: void
Date: Sat Nov 30 22:33:11 2013
New Revision: 196015

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

Modified:
    cfe/branches/release_34/   (props changed)

Propchange: cfe/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 30 22:33:11 2013
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:195126,195128,195135-195136,195146,195149,195154,195158,195163,195168,195174,195268,195283,195303,195326,195329,195367,195384,195409,195420,195422,195501,195547,195556,195558,195587,195620,195669,195687,195693,195710,195713,195716,195760,195768,195777,195789,195792,195804,195827,195843-195844,195877,195887-195888,195897,195903,195905-195906,195970,195983
+/cfe/trunk:195126,195128,195135-195136,195146,195149,195154,195158,195163,195168,195174,195268,195283,195303,195326,195329,195367,195384,195409,195420,195422,195501,195547,195556,195558,195587,195620,195669,195687,195693,195710,195713,195716,195760,195768,195777,195789,195792,195804,195827,195843-195844,195877,195887-195888,195897,195903,195905-195906,195932,195970,195983
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920