fix conflicts
authorKevin Rosenberg <kevin@rosenberg.net>
Thu, 31 Jan 2008 01:54:16 +0000 (18:54 -0700)
committerKevin Rosenberg <kevin@rosenberg.net>
Thu, 31 Jan 2008 01:54:16 +0000 (18:54 -0700)
1  2 
ChangeLog
datetime.lisp

diff --cc ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,12 +1,16 @@@
- 28 Jun 2008  Kevin Rosenberg <kevin@rosenberg.net>
-       * Version 1.96
++28 Jan 2008  Kevin Rosenberg <kevin@rosenberg.net>
++      * Version 1.98
 +      * {datetime,strings,tests}.lisp: Add remove-char-string
 +
+ 18 Sep 2007  Kevin Rosenberg <kevin@rosenberg.net>
+       * Version 1.97
+       * datetime.lisp: Improve output format for date-string
+ 10 Sep 2007  Kevin Rosenberg <kevin@rosenberg.net>
+       * Version 1.96
+       * byte-stream.lisp: Use without-package-locks as suggested
+       by Daniel Gackle.       
  01 Jun 2007  Kevin Rosenberg <kevin@rosenberg.net>
        * Version 1.95
        * {datetime,package}.lisp: Add day-of-week and pretty-date-ut
diff --cc datetime.lisp
Simple merge