[llvm-branch-commits] [cfe-branch] r195811 - Merging r195760:

[Bill Wendling]

Author: void
Date: Tue Nov 26 22:55:09 2013
New Revision: 195811

URL: http://llvm.org/viewvc/llvm-project?rev=195811&view=rev
Log:
Merging r195760:
------------------------------------------------------------------------
r195760 | ggreif | 2013-11-26 05:28:51 -0800 (Tue, 26 Nov 2013) | 1 line

fix a typo
------------------------------------------------------------------------

Modified:
    cfe/branches/release_34/   (props changed)
    cfe/branches/release_34/docs/CrossCompilation.rst

Propchange: cfe/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 26 22:55:09 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,195326,195329,195367,195384,195409,195420,195422,195501,195547,195556,195558,195587,195620,195669,195687,195693,195710,195716
+/cfe/trunk:195126,195128,195135-195136,195146,195149,195154,195158,195163,195168,195174,195268,195283,195326,195329,195367,195384,195409,195420,195422,195501,195547,195556,195558,195587,195620,195669,195687,195693,195710,195716,195760
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_34/docs/CrossCompilation.rst
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_34/docs/CrossCompilation.rst?rev=195811&r1=195810&r2=195811&view=diff
==============================================================================
--- cfe/branches/release_34/docs/CrossCompilation.rst (original)
+++ cfe/branches/release_34/docs/CrossCompilation.rst Tue Nov 26 22:55:09 2013
@@ -190,7 +190,7 @@ Multilibs
 
 When you want to cross-compile to more than one configuration, for
 example hard-float-ARM and soft-float-ARM, you'll have to have multiple
-copies of you libraries and (possibly) headers.
+copies of your libraries and (possibly) headers.
 
 Some Linux distributions have support for Multilib, which handle that
 for you in an easier way, but if you're not careful and, for instance,