[llvm-branch-commits] [llvm-branch] r106293 - in /llvm/branches/Apple/Troughton: ./ include/llvm/CodeGen/ISDOpcodes.h

[Jim Grosbach]

Author: grosbach
Date: Fri Jun 18 12:42:11 2010
New Revision: 106293

URL: http://llvm.org/viewvc/llvm-project?rev=106293&view=rev
Log:
merge 106292

Modified:
    llvm/branches/Apple/Troughton/   (props changed)
    llvm/branches/Apple/Troughton/include/llvm/CodeGen/ISDOpcodes.h

Propchange: llvm/branches/Apple/Troughton/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 18 12:42:11 2010
@@ -1 +1 @@
-/llvm/trunk:105358,105361,105369,105372,105399,105427,105437,105439,105441,105470,105473,105481,105498,105541,105554,105557,105585-105586,105634,105653,105665,105669,105677,105745,105749,105774-105775,105836,105845,105862,105938,105959,105965,105969,105982,105990-105991,105997-105998,106004,106015,106021,106024,106027,106030,106051,106057,106146,106149,106152,106155,106157,106164,106199,106203-106204,106227,106229,106289
+/llvm/trunk:105358,105361,105369,105372,105399,105427,105437,105439,105441,105470,105473,105481,105498,105541,105554,105557,105585-105586,105634,105653,105665,105669,105677,105745,105749,105774-105775,105836,105845,105862,105938,105959,105965,105969,105982,105990-105991,105997-105998,106004,106015,106021,106024,106027,106030,106051,106057,106146,106149,106152,106155,106157,106164,106199,106203-106204,106227,106229,106289,106292

Modified: llvm/branches/Apple/Troughton/include/llvm/CodeGen/ISDOpcodes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Troughton/include/llvm/CodeGen/ISDOpcodes.h?rev=106293&r1=106292&r2=106293&view=diff
==============================================================================
--- llvm/branches/Apple/Troughton/include/llvm/CodeGen/ISDOpcodes.h (original)
+++ llvm/branches/Apple/Troughton/include/llvm/CodeGen/ISDOpcodes.h Fri Jun 18 12:42:11 2010
@@ -130,7 +130,7 @@
     /// This node represents a target intrinsic function with no side effects.
     /// The first operand is the ID number of the intrinsic from the
     /// llvm::Intrinsic namespace.  The operands to the intrinsic follow.  The
-    /// node has returns the result of the intrinsic.
+    /// node returns the result of the intrinsic.
     INTRINSIC_WO_CHAIN,
 
     /// RESULT,OUTCHAIN = INTRINSIC_W_CHAIN(INCHAIN, INTRINSICID, arg1, ...)