~ chicken-core (chicken-5) 7e98f03d5fe30db6b328df0fc3a4b3b4054d9812


commit 7e98f03d5fe30db6b328df0fc3a4b3b4054d9812
Merge: 7d994a90 9fa79d4c
Author:     Felix <bunny351@gmail.com>
AuthorDate: Sat Nov 7 23:44:10 2009 +0100
Commit:     Felix <bunny351@gmail.com>
CommitDate: Sat Nov 7 23:44:10 2009 +0100

    fixed conflicts in TODO

diff --cc TODO
index 827d9435,3a248d8a..f67c0b71
--- a/TODO
+++ b/TODO
@@@ -193,8 -301,29 +301,27 @@@ Date:   Sun Oct 11 11:37:06 2009 +020
  
      remove tracing facilities from csi - this can be done better using the advice egg
  
- ** SHA-1 commit-ID in banner
+ *** minor
+ 
+ commit ab284ea5881e8a6698f1bfff8e3d0d3ce57ee425
+ Author: unknown <felix@.(none)>
+ Date:   Thu Oct 22 09:40:10 2009 +0200
+ 
+     upgrade message in setup-api shows version (thanks to ckeen)
+ 
+ commit c5fac3c98d7c187e0564d062c3f77623f3882741
+ Author: unknown <felix@.(none)>
+ Date:   Tue Oct 20 12:21:53 2009 +0200
+ 
+     cleanups in some text-files
+ 
+ commit 89a110080526e0160f3240281d3bd98eb0aff0ba
+ Author: unknown <felix@.(none)>
+ Date:   Tue Oct 20 12:18:53 2009 +0200
+ 
+     removed some obsolete scripts and files
+ ****  This is to be split up (manual.css stays)
  
 -** SHA-1 commit-ID in banner
 -
  ** module issues
  *** need a way to omit generating module registration without generating import lib
      for example when compiling static version, where implib already exists
Trap