~ chicken-core (chicken-5) a0eb3a76048c7f520e190167558789d0cd9aefe1

commit a0eb3a76048c7f520e190167558789d0cd9aefe1
Merge: 44509903 df279bda
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Mon Jun 20 15:51:52 2011 +0200
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Mon Jun 20 15:51:52 2011 +0200

    resolved conflicts

diff --cc batch-driver.scm
index 963ae1b6,3a6d5627..75733853
--- a/batch-driver.scm
+++ b/batch-driver.scm
@@@ -538,8 -524,7 +538,7 @@@
  			(dribble "Loading inline file ~a ..." ilf)
  			(load-inline-file ilf) )
  		      ifs)))
- 
 -		 (when do-scrutinize
 +		 (when (or do-scrutinize enable-specialization)
  		   ;;XXX hardcoded database file name
  		   (unless (memq 'ignore-repository options)
  		     (load-type-database "types.db"))