~ chicken-core (chicken-5) 37c631f433706cf06de4bc862356f5f18b2f9aa8
commit 37c631f433706cf06de4bc862356f5f18b2f9aa8
Merge: 5b334002 84c222be
Author: felix <felix@call-with-current-continuation.org>
AuthorDate: Tue May 10 11:13:21 2011 +0200
Commit: felix <felix@call-with-current-continuation.org>
CommitDate: Tue May 10 11:13:21 2011 +0200
resolved conflicts in dist.-manifest
diff --cc distribution/manifest
index 9c61aaf6,c73b7437..88a7ff00
--- a/distribution/manifest
+++ b/distribution/manifest
@@@ -172,13 -172,11 +172,18 @@@ tests/dwindtst.sc
tests/dwindtst.expected
tests/callback-tests.scm
tests/reader-tests.scm
+tests/simple-functors-test.scm
+tests/breadth-first.scm
+tests/QUEUE.scm
+tests/test-queue.scm
+tests/functor-tests.scm
+tests/square-functor.scm
+tests/use-square-functor.scm
+ tests/pp-test.scm
+ tests/reverser/reverser.meta
+ tests/reverser/reverser.setup
+ tests/reverser/reverser.scm
+ tests/rev-app.scm
tweaks.scm
utils.scm
apply-hack.x86.S
Trap