Merge branch 'master' into boehm-demers-weiser-gc
authorLudovic Courtès <ludo@gnu.org>
Sun, 22 Mar 2009 14:28:35 +0000 (15:28 +0100)
committerLudovic Courtès <ludo@gnu.org>
Sun, 22 Mar 2009 14:28:35 +0000 (15:28 +0100)
commitd9e59f894e1b41958203ddda7f21f4817cfcfe37
treef0d6b0b38ed000aabf327dba4e281c37c60f92a5
parentf307fbcec2cbaaa95b8c861395133b519c7519cf
parent80540f391498ebb0f955db2fafb6a36ed03b7886
Merge branch 'master' into boehm-demers-weiser-gc

Conflicts:
libguile/continuations.c
libguile/gc-freelist.c
libguile/gc-mark.c
libguile/symbols.c
libguile/threads.c
module/ice-9/boot-9.scm
18 files changed:
configure.in
libguile/Makefile.am
libguile/continuations.c
libguile/debug.c
libguile/dynwind.c
libguile/eval.c
libguile/goops.c
libguile/init.c
libguile/load.c
libguile/macros.c
libguile/modules.c
libguile/objects.c
libguile/procs.c
libguile/symbols.c
libguile/threads.c
libguile/threads.h
module/ice-9/boot-9.scm
test-suite/Makefile.am