--- a/Tools__SmalltalkMergeTool.st	Fri Mar 09 23:06:58 2012 +0000
+++ b/Tools__SmalltalkMergeTool.st	Fri Mar 16 17:08:17 2012 +0000
@@ -1,3 +1,14 @@
+"
+ COPYRIGHT (c) 2006 by eXept Software AG
+              All Rights Reserved
+
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice.   This software may not
+ be provided or otherwise made available to, or used by, any
+ other person.  No title to or ownership of the software is
+ hereby transferred.
+"
 "{ Package: 'stx:libtool' }"
 
 "{ NameSpace: Tools }"
@@ -18,6 +29,20 @@
 
 !SmalltalkMergeTool class methodsFor:'documentation'!
 
+copyright
+"
+ COPYRIGHT (c) 2006 by eXept Software AG
+              All Rights Reserved
+
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice.   This software may not
+ be provided or otherwise made available to, or used by, any
+ other person.  No title to or ownership of the software is
+ hereby transferred.
+"
+!
+
 documentation
 "
     documentation to be added.
@@ -571,7 +596,7 @@
 !SmalltalkMergeTool::DiffItem class methodsFor:'documentation'!
 
 version
-    ^'$Id: Tools__SmalltalkMergeTool.st,v 1.2 2011/07/03 20:56:26 cg Exp $'
+    ^'$Id: Tools__SmalltalkMergeTool.st 7925 2012-03-16 17:08:17Z vranyj1 $'
 ! !
 
 !SmalltalkMergeTool::DiffItem class methodsFor:'image specs'!
@@ -879,7 +904,7 @@
 !
 
 version_SVN
-    ^ '$Id: Tools__SmalltalkMergeTool.st 7486 2009-10-26 22:06:24Z vranyj1 $'
+    ^ '$Id: Tools__SmalltalkMergeTool.st 7925 2012-03-16 17:08:17Z vranyj1 $'
 ! !
 
-SmalltalkMergeTool initialize!
\ No newline at end of file
+SmalltalkMergeTool initialize!