Merge jv
authorMerge Script
Fri, 29 Jul 2016 06:57:06 +0200
branchjv
changeset 4014 195df53729d3
parent 4010 ffad47fc7637 (current diff)
parent 4013 a191e524042c (diff)
child 4016 fc246bf83d3d
Merge
ZipArchive.st
--- a/PostscriptPrinterStream.st	Thu Jul 28 06:49:24 2016 +0200
+++ b/PostscriptPrinterStream.st	Fri Jul 29 06:57:06 2016 +0200
@@ -927,7 +927,7 @@
     "Modified: 10.4.1996 / 13:36:07 / cg"
 ! !
 
-!PostscriptPrinterStream methodsFor:'open/close'!
+!PostscriptPrinterStream methodsFor:'open & close'!
 
 endPrint
     "finish a document - finish page; then send documentTrailer.
--- a/PrinterStream.st	Thu Jul 28 06:49:24 2016 +0200
+++ b/PrinterStream.st	Fri Jul 29 06:57:06 2016 +0200
@@ -813,7 +813,7 @@
     stream := aStream.
 ! !
 
-!PrinterStream methodsFor:'open / close'!
+!PrinterStream methodsFor:'open & close'!
 
 basicClose
     stream close
--- a/ZipArchive.st	Thu Jul 28 06:49:24 2016 +0200
+++ b/ZipArchive.st	Fri Jul 29 06:57:06 2016 +0200
@@ -3265,7 +3265,7 @@
     self closeFile
 ! !
 
-!ZipArchive methodsFor:'open / close'!
+!ZipArchive methodsFor:'open & close'!
 
 close
      self closeFile