~ chicken-core (chicken-5) bf6c3e5f405fd76a04fea28169fe6c2b94d21d8e

commit bf6c3e5f405fd76a04fea28169fe6c2b94d21d8e
Merge: ae8a9edb 3cbd42e9
Author:     felix <bunny351@gmail.com>
AuthorDate: Tue May 18 07:44:45 2010 +0200
Commit:     felix <bunny351@gmail.com>
CommitDate: Tue May 18 07:44:45 2010 +0200

    resolved conflicts

diff --cc Makefile
index 5867e85b,3b643e87..3837cad6
--- a/Makefile
+++ b/Makefile
@@@ -35,7 -35,7 +35,7 @@@ endi
  
  STANDARD_TARGETS \
  	= all clean distclean spotless install uninstall confclean check \
- 	  fullcheck dist libs install-target bench
 -	  fullcheck dist libs install-target install-dev
++	  fullcheck dist libs install-target install-dev bench
  
  SRCDIR = .