Merge jv
authorMerge Script
Thu, 03 Sep 2015 06:56:33 +0200
branchjv
changeset 15830 21dc9d6ef3a1
parent 15828 833ae1c37126 (current diff)
parent 15829 ba4d543aff02 (diff)
child 15840 9985aec41e0d
child 15843 1c2cf683dbd2
Merge
Tools__CheckinInfoDialog.st
--- a/Tools__CheckinInfoDialog.st	Wed Sep 02 06:45:59 2015 +0200
+++ b/Tools__CheckinInfoDialog.st	Thu Sep 03 06:56:33 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2005 eXept Software AG
               All Rights Reserved
@@ -379,7 +381,7 @@
 !
 
 logMessage
-    ^ self logMessageHolder value
+    ^ self logMessageHolder value ? ''
 !
 
 logMessage:aString
@@ -527,10 +529,10 @@
 !CheckinInfoDialog class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__CheckinInfoDialog.st,v 1.24 2014-08-01 07:02:56 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__CheckinInfoDialog.st,v 1.24 2014-08-01 07:02:56 cg Exp $'
+    ^ '$Header$'
 ! !