HCoop Git - bpt/guile.git/commit

HCoop / bpt / guile.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b74e86c 29776e8)

author	Ludovic Courtès <ludo@gnu.org>
	Wed, 10 Sep 2008 20:50:04 +0000 (22:50 +0200)
committer	Ludovic Courtès <ludo@gnu.org>
	Wed, 10 Sep 2008 20:50:04 +0000 (22:50 +0200)
commit	6774820f1e83a388b3232cd61a66340886b395d8
tree	513cae9f2b9168aea1e4e20c3ce91cf89e0ce817	tree \| snapshot (tar.gz zip)
parent	b74e86cf5f50612742609210ad8e04d46069437f	commit \| diff
parent	29776e85da637ec4d44b2b2822d6934a50c0084b	commit \| diff

Merge commit '29776e85da637ec4d44b2b2822d6934a50c0084b' into boehm-demers-weiser-gc

Conflicts:
libguile/gc-card.c
libguile/gc.c
libguile/gc.h
libguile/ports.c

configure.in	diff1 \|	diff2 \|	blob \| history
libguile/Makefile.am	diff1 \|	diff2 \|	blob \| history
libguile/eval.c	diff1 \|	diff2 \|	blob \| history
libguile/fports.c	diff1 \|	diff2 \|	blob \| history
libguile/init.c	diff1 \|	diff2 \|	blob \| history
libguile/numbers.c	diff1 \|	diff2 \|	blob \| history
libguile/ports.c	diff1 \|	diff2 \|	blob \| history
libguile/srfi-14.c	diff1 \|	diff2 \|	blob \| history
libguile/threads.c	diff1 \|	diff2 \|	blob \| history
libguile/weaks.h	diff1 \|	diff2 \|	blob \| history
test-suite/Makefile.am	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.