[llvm-branch-commits] [llvm-branch] r226095 - Merging r226058:

[Duncan P. N. Exon Smith]

Author: dexonsmith
Date: Wed Jan 14 22:04:53 2015
New Revision: 226095

URL: http://llvm.org/viewvc/llvm-project?rev=226095&view=rev
Log:
Merging r226058:
------------------------------------------------------------------------
r226058 | dexonsmith | 2015-01-14 15:11:51 -0800 (Wed, 14 Jan 2015) | 1 line

IR: Fix comment spelling, NFC
------------------------------------------------------------------------

Modified:
    llvm/branches/release_36/   (props changed)
    llvm/branches/release_36/include/llvm/IR/Metadata.h

Propchange: llvm/branches/release_36/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 14 22:04:53 2015
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,226023,226029,226044,226046,226048
+/llvm/trunk:155241,226023,226029,226044,226046,226048,226058

Modified: llvm/branches/release_36/include/llvm/IR/Metadata.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_36/include/llvm/IR/Metadata.h?rev=226095&r1=226094&r2=226095&view=diff
==============================================================================
--- llvm/branches/release_36/include/llvm/IR/Metadata.h (original)
+++ llvm/branches/release_36/include/llvm/IR/Metadata.h Wed Jan 14 22:04:53 2015
@@ -894,7 +894,7 @@ class MDNodeFwdDecl : public MDNode, Rep
 public:
   ~MDNodeFwdDecl() { dropAllReferences(); }
 
-  // MSVC doesn't seem to see the alternaive: "using MDNode::operator delete".
+  // MSVC doesn't see the alternative: "using MDNode::operator delete".
   void operator delete(void *Mem) { MDNode::operator delete(Mem); }
 
   static MDNodeFwdDecl *get(LLVMContext &Context, ArrayRef<Metadata *> MDs) {