From: Kevin Rosenberg Date: Thu, 31 Jan 2008 01:54:16 +0000 (-0700) Subject: fix conflicts X-Git-Tag: v1.98~1 X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=commitdiff_plain;h=1142016daa209cb657b035c651641a94ef49892a fix conflicts --- 1142016daa209cb657b035c651641a94ef49892a diff --cc ChangeLog index a717b52,054ba37..e07a5f9 --- a/ChangeLog +++ b/ChangeLog @@@ -1,7 -1,12 +1,16 @@@ - 28 Jun 2008 Kevin Rosenberg - * Version 1.96 ++28 Jan 2008 Kevin Rosenberg ++ * Version 1.98 + * {datetime,strings,tests}.lisp: Add remove-char-string + + 18 Sep 2007 Kevin Rosenberg + * Version 1.97 + * datetime.lisp: Improve output format for date-string + + 10 Sep 2007 Kevin Rosenberg + * Version 1.96 + * byte-stream.lisp: Use without-package-locks as suggested + by Daniel Gackle. + 01 Jun 2007 Kevin Rosenberg * Version 1.95 * {datetime,package}.lisp: Add day-of-week and pretty-date-ut