resolved conflict state with HEAD r14096

[blender.git] / intern / memutil / MEM_SmartPtr.h

diff --git a/intern/memutil/MEM_SmartPtr.h b/intern/memutil/MEM_SmartPtr.h
index 93b545d9ced74b52667808c96880396f02564c13..55bae151027f8e1c48202b801d8dbe8f068bed18 100644 (file)
--- a/intern/memutil/MEM_SmartPtr.h
+++ b/intern/memutil/MEM_SmartPtr.h
@@ -28,20 +28,19 @@
  *
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
+/**
+ * @file       MEM_SmartPtr.h
+ * Declaration of MEM_RefCounted and MEM_RefCountable classes.
+ * @author Laurence
+ */
 
 #ifndef NAN_INCLUDED_MEM_SmartPtr_h
-
 #define NAN_INCLUDED_MEM_SmartPtr_h
 
-/**
- * $Id$
- * Copyright (C) 2001 NaN Technologies B.V.
- *
- * @author Laurence
- */
 
 #include <stdlib.h> // for NULL !
 
+
 /**
  * @section MEM_SmartPtr 
  * This class defines a smart pointer similar to that defined in 
@@ -87,7 +86,7 @@
  *             MEM_SmartPtr<foo> m_foo;
  *     }
  *                     
- * You my also safely construct vectors of MEM_SmartPtrs and 
+ * You may also safely construct vectors of MEM_SmartPtrs and 
  * have the vector own stuff you put into it. 
  *
  * e.g.