Merge jv
authorMerge Script
Fri, 11 Mar 2016 07:02:43 +0100
branchjv
changeset 5608 01b36024c2cc
parent 5606 f14c4dd11731 (current diff)
parent 5607 15954ba676b8 (diff)
child 5611 17b35abfb74e
Merge
--- a/EnterBox.st	Thu Mar 10 06:57:52 2016 +0100
+++ b/EnterBox.st	Fri Mar 11 07:02:43 2016 +0100
@@ -297,7 +297,7 @@
 
 request:aTitle
     "create and show an enterBox asking for aTitle.
-     Return the enterred string or an empty string (if abort was pressed).
+     Return the entered string or an empty string (if abort was pressed).
      The string may be empty, in case return was pressed immediately."
 
     ^ self new request:aTitle
@@ -725,10 +725,10 @@
 !EnterBox class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/EnterBox.st,v 1.74 2015-03-24 15:24:10 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg/EnterBox.st,v 1.74 2015-03-24 15:24:10 cg Exp $'
+    ^ '$Header$'
 ! !