HCoop Git - bpt/guile.git/commit

HCoop / bpt / guile.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3ec17f2 0329137)

author	Ludovic Courtès <ludo@gnu.org>
	Wed, 10 Sep 2008 20:33:40 +0000 (22:33 +0200)
committer	Ludovic Courtès <ludo@gnu.org>
	Wed, 10 Sep 2008 20:33:40 +0000 (22:33 +0200)
commit	4a4849dbe0ae1b731b408167f90222e05d1ca2bd
tree	caa909b99ffb221e43408a3d19ad3e8209e3a96b	tree \| snapshot (tar.gz zip)
parent	3ec17f28b8f96fa43218db83656c0d85b4f69d7c	commit \| diff
parent	032913739218c756f673bfb9c8f66ef9f8f02330	commit \| diff

Merge commit '032913739218c756f673bfb9c8f66ef9f8f02330' into boehm-demers-weiser-gc

Conflicts:
libguile/gc.c
libguile/srcprop.c
libguile/srcprop.h

15 files changed:

configure.in	diff1 \|	diff2 \|	blob \| history
libguile/Makefile.am	diff1 \|	diff2 \|	blob \| history
libguile/debug.c	diff1 \|	diff2 \|	blob \| history
libguile/eval.c	diff1 \|	diff2 \|	blob \| history
libguile/gc.c	diff1 \|	diff2 \|	blob \| history
libguile/init.c	diff1 \|	diff2 \|	blob \| history
libguile/macros.c	diff1 \|	diff2 \|	blob \| history
libguile/numbers.c	diff1 \|	diff2 \|	blob \| history
libguile/print.c	diff1 \|	diff2 \|	blob \| history
libguile/private-gc.h	diff1 \|	diff2 \|	blob \| history
libguile/regex-posix.c	diff1 \|	diff2 \|	blob \| history
libguile/srcprop.c	diff1 \|	diff2 \|	blob \| history
libguile/struct.c	diff1 \|	diff2 \|	blob \| history
libguile/symbols.c	diff1 \|	diff2 \|	blob \| history
libguile/threads.c	diff1 \|	diff2 \|	blob \| history

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