~ chicken-core (chicken-5) e2ce36f92c6e47bb4629062014dda869fdb51b90

commit e2ce36f92c6e47bb4629062014dda869fdb51b90
Merge: 531740a3 20704eaa
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Tue May 3 12:16:26 2011 +0200
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Tue May 3 12:16:26 2011 +0200

    resolved conflicts

diff --cc types.db
index 03a2728c,28783eb7..03964234
--- a/types.db
+++ b/types.db
@@@ -2065,10 -1419,10 +2065,10 @@@
  
  (for-each-argv-line deprecated)
  (for-each-line deprecated)
 -(read-all (procedure read-all (#!optional (or port string)) string))
 -(system* (procedure system* (string #!rest) undefined))
 -(qs (procedure qs (string) string))
 -(compile-file (procedure compile-file (string #!rest) (or boolean string)))
 -(compile-file-options (procedure compile-file-options (#!optional list) list))
 -(scan-input-lines (procedure scan-input-lines (* #!optional port) *))
 -(yes-or-no? (procedure yes-or-no? (string #!rest) *))
 +(read-all (procedure! read-all (#!optional (or port string)) string))
 +(system* (procedure! system* (string #!rest) undefined))
 +(qs (procedure! qs (string) string))
- (compile-file (procedure! compile-file (string #!rest) string))
++(compile-file (procedure! compile-file (string #!rest) (or boolean string)))
 +(compile-file-options (procedure! compile-file-options (#!optional list) list))
 +(scan-input-lines (procedure! scan-input-lines (* #!optional port) *))
 +(yes-or-no? (procedure! yes-or-no? (string #!rest) *))