HCoop Git - bpt/guile.git/commit

HCoop / bpt / guile.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f0eb5ae d7e7a02)

author	Ludovic Courtès <ludo@gnu.org>
	Tue, 1 Sep 2009 22:07:27 +0000 (00:07 +0200)
committer	Ludovic Courtès <ludo@gnu.org>
	Tue, 1 Sep 2009 23:37:37 +0000 (01:37 +0200)
commit	5f236208d0d864546e59afa0f5a11c9b3ba14b10
tree	eed5d9203a2633c8efb85c1b36425eab87574299	tree \| snapshot (tar.gz zip)
parent	f0eb5ae6c173aed35965b0561897fda1d8ff0db1	commit \| diff
parent	d7e7a02a6251c8ed4f76933d9d30baeee3f599c0	commit \| diff

Merge branch 'boehm-demers-weiser-gc' into bdw-gc-static-alloc

Conflicts:
acinclude.m4
libguile/strings.c

14 files changed:

acinclude.m4	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
libguile/__scm.h	diff1 \|	diff2 \|	blob \| history
libguile/_scm.h	diff1 \|	diff2 \|	blob \| history
libguile/boehm-gc.h	diff1 \|	diff2 \|	blob \| history
libguile/eval.c	diff1 \|	diff2 \|	blob \| history
libguile/guile-snarf.in	diff1 \|	diff2 \|	blob \| history
libguile/procs.h	diff1 \|	diff2 \|	blob \| history
libguile/snarf.h	diff1 \|	diff2 \|	blob \| history
libguile/strings.c	diff1 \|	diff2 \|	blob \| history
libguile/strings.h	diff1 \|	diff2 \|	blob \| history
libguile/tags.h	diff1 \|	diff2 \|	blob \| history
libguile/vectors.c	diff1 \|	diff2 \|	blob \| history
libguile/weaks.c	diff1 \|	diff2 \|	blob \| history

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