Merge commit 'f30e1bdf97ae8b2b2918da585f887a4d3a23a347' into boehm-demers-weiser-gc
authorLudovic Courtès <ludo@gnu.org>
Wed, 10 Sep 2008 20:27:30 +0000 (22:27 +0200)
committerLudovic Courtès <ludo@gnu.org>
Wed, 10 Sep 2008 20:27:30 +0000 (22:27 +0200)
commit35a9197ccc91a3663313e1bf7d369101754a1075
tree0389f04f4267d26b70c8e8cd54329be28ccf438b
parente7bca22779c68b800c75fdad8841440dfeb32f8d
parentf30e1bdf97ae8b2b2918da585f887a4d3a23a347
Merge commit 'f30e1bdf97ae8b2b2918da585f887a4d3a23a347' into boehm-demers-weiser-gc

Conflicts:
libguile/Makefile.am
libguile/coop-pthreads.c
libguile/gc-freelist.c
libguile/gc-segment.c
libguile/gc.c
libguile/private-gc.h
test-suite/tests/environments.nottest
19 files changed:
configure.in
libguile/Makefile.am
libguile/continuations.c
libguile/coop-pthreads.c
libguile/environments.c
libguile/eval.c
libguile/fports.c
libguile/gc.c
libguile/gc.h
libguile/init.c
libguile/modules.c
libguile/numbers.c
libguile/ports.c
libguile/pthread-threads.h
libguile/threads.c
libguile/unif.c
libguile/vectors.c
test-suite/Makefile.am
test-suite/tests/environments.nottest