Ludovic Courtès
|
fbb857a472
|
Merge branch 'master' into boehm-demers-weiser-gc
Conflicts:
lib/Makefile.am
libguile/Makefile.am
libguile/frames.c
libguile/gc-card.c
libguile/gc-freelist.c
libguile/gc-mark.c
libguile/gc-segment.c
libguile/gc_os_dep.c
libguile/load.c
libguile/macros.c
libguile/objcodes.c
libguile/programs.c
libguile/strings.c
libguile/vm.c
m4/gnulib-cache.m4
m4/gnulib-comp.m4
m4/inline.m4
|
2009-08-18 00:06:45 +02:00 |
|
Ludovic Courtès
|
35a9197ccc
|
Merge commit 'f30e1bdf97' 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
|
2008-09-10 22:27:30 +02:00 |
|
Ludovic Courtes
|
080ecf3f7b
|
Disabled the `environments' unit test.
* test-suite/Makefile.am (SCM_TESTS): Removed `tests/environments.test'.
* test-suite/tests/environments.nottest: Disabled.
git-archimport-id: lcourtes@laas.fr--2005-libre/guile-core--boehm-gc--1.9--patch-19
|
2008-09-05 00:48:47 +02:00 |
|