Mercurial Mercurial > hg > stx-libbasic / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge jv
authorMerge Script
Wed, 08 Jul 2015 07:01:47 +0200
branchjv
changeset 18565 a391ed9702da
parent 18563 de37550dc3dd (current diff)
parent 18564 55bd2aa4d56e (diff)
child 18569 706dbab4637e
Merge
--- a/TimeDuration.st	Tue Jul 07 22:31:05 2015 +0100
+++ b/TimeDuration.st	Wed Jul 08 07:01:47 2015 +0200
@@ -179,6 +179,7 @@
     "
      TimeDuration microseconds:2499 
      TimeDuration microseconds:2500 
+     TimeDuration microseconds:12345678900 
     "
 !
 
@@ -1064,30 +1065,30 @@
     ^ fmt.
 
     "
-     (TimeDuration hours:0 minutes:0 seconds:0 millis:12) formatForPrinting       
+     (TimeDuration hours:0 minutes:0 seconds:0 milliseconds:12) formatForPrinting       
 
-     (TimeDuration hours:0 minutes:0 seconds:0 millis:123) formatForPrinting       
-     (TimeDuration hours:0 minutes:0 seconds:10 millis:123) formatForPrinting       
-     (TimeDuration hours:0 minutes:33 seconds:0 millis:123) formatForPrinting       
-     (TimeDuration hours:2 minutes:0 seconds:0 millis:123) formatForPrinting       
-     (TimeDuration hours:2 minutes:33 seconds:0 millis:123) formatForPrinting       
-     (TimeDuration hours:100 minutes:33 seconds:0 millis:123) formatForPrinting    
-     (TimeDuration hours:10000 minutes:33 seconds:0 millis:123) formatForPrinting    
-     (TimeDuration hours:1000000 minutes:33 seconds:0 millis:123) formatForPrinting    
+     (TimeDuration hours:0 minutes:0 seconds:0 milliseconds:123) formatForPrinting       
+     (TimeDuration hours:0 minutes:0 seconds:10 milliseconds:123) formatForPrinting       
+     (TimeDuration hours:0 minutes:33 seconds:0 milliseconds:123) formatForPrinting       
+     (TimeDuration hours:2 minutes:0 seconds:0 milliseconds:123) formatForPrinting       
+     (TimeDuration hours:2 minutes:33 seconds:0 milliseconds:123) formatForPrinting       
+     (TimeDuration hours:100 minutes:33 seconds:0 milliseconds:123) formatForPrinting    
+     (TimeDuration hours:10000 minutes:33 seconds:0 milliseconds:123) formatForPrinting    
+     (TimeDuration hours:1000000 minutes:33 seconds:0 milliseconds:123) formatForPrinting    
 
-     (TimeDuration hours:0 minutes:38 seconds:22 millis:123) formatForPrinting:true       
+     (TimeDuration hours:0 minutes:38 seconds:22 milliseconds:123) formatForPrinting:true       
 
-     (TimeDuration hours:2 minutes:33 seconds:0 millis:0) formatForPrinting         
-     (TimeDuration hours:2 minutes:0 seconds:0 millis:0) formatForPrinting          
-     (TimeDuration hours:24 minutes:0 seconds:0 millis:0) formatForPrinting          
+     (TimeDuration hours:2 minutes:33 seconds:0 milliseconds:0) formatForPrinting         
+     (TimeDuration hours:2 minutes:0 seconds:0 milliseconds:0) formatForPrinting          
+     (TimeDuration hours:24 minutes:0 seconds:0 milliseconds:0) formatForPrinting          
 
-     (TimeDuration hours:0 minutes:0 seconds:0 millis:123) printStringFormat:'%h:%m:%s'       
-     (TimeDuration hours:0 minutes:0 seconds:10 millis:123) printStringFormat:'%h:%m:%s'         
-     (TimeDuration hours:0 minutes:33 seconds:0 millis:123) printStringFormat:'%h:%m:%s'         
-     (TimeDuration hours:2 minutes:33 seconds:0 millis:123) printStringFormat:'%h:%m:%s'         
-     (TimeDuration hours:100 minutes:33 seconds:0 millis:123) printStringFormat:'%h:%m:%s'      
-     (TimeDuration hours:10000 minutes:33 seconds:0 millis:123) printStringFormat:'%h:%m:%s'      
-     (TimeDuration hours:1000000 minutes:33 seconds:0 millis:123) printStringFormat:'%h:%m:%s'      
+     (TimeDuration hours:0 minutes:0 seconds:0 milliseconds:123) printStringFormat:'%h:%m:%s'       
+     (TimeDuration hours:0 minutes:0 seconds:10 milliseconds:123) printStringFormat:'%h:%m:%s'         
+     (TimeDuration hours:0 minutes:33 seconds:0 milliseconds:123) printStringFormat:'%h:%m:%s'         
+     (TimeDuration hours:2 minutes:33 seconds:0 milliseconds:123) printStringFormat:'%h:%m:%s'         
+     (TimeDuration hours:100 minutes:33 seconds:0 milliseconds:123) printStringFormat:'%h:%m:%s'      
+     (TimeDuration hours:10000 minutes:33 seconds:0 milliseconds:123) printStringFormat:'%h:%m:%s'      
+     (TimeDuration hours:1000000 minutes:33 seconds:0 milliseconds:123) printStringFormat:'%h:%m:%s'      
     "
 
     "Modified: / 18-07-2007 / 14:06:17 / cg"
@@ -1161,11 +1162,11 @@
 !TimeDuration class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/TimeDuration.st,v 1.75 2015-02-03 15:14:18 stefan Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/TimeDuration.st,v 1.75 2015-02-03 15:14:18 stefan Exp $'
+    ^ '$Header$'
 ! !
hg/stx-libbasic