HCoop Git - bpt/guile.git/commit

HCoop / bpt / guile.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 325226d e20d700)

author	Andy Wingo <wingo@oblong.net>
	Tue, 17 Mar 2009 15:40:52 +0000 (16:40 +0100)
committer	Andy Wingo <wingo@oblong.net>
	Tue, 17 Mar 2009 15:40:52 +0000 (16:40 +0100)
commit	3b91e017e32e1fb6b911f456c61aea6386075095
tree	23ec6a0c667756eb48148ada7704086eb489964d	tree \| snapshot (tar.gz zip)
parent	325226dad9ab6f0488500e7381a5d1c07dc9ae91	commit \| diff
parent	e20d7001c3f7150400169fecb0bf0eefdf122fe2	commit \| diff

Merge commit 'e20d7001c3f7150400169fecb0bf0eefdf122fe2' into vm-check

Conflicts:

libguile/stacks.c

libguile/debug.c	diff1 \|	diff2 \|	blob \| history
libguile/eval.c	diff1 \|	diff2 \|	blob \| history
libguile/eval.i.c	diff1 \|	diff2 \|	blob \| history
libguile/gc-mark.c	diff1 \|	diff2 \|	blob \| history
libguile/goops.c	diff1 \|	diff2 \|	blob \| history
libguile/procs.c	diff1 \|	diff2 \|	blob \| history
libguile/stacks.c	diff1 \|	diff2 \|	blob \| history
test-suite/Makefile.am	diff1 \|	diff2 \|	blob \| history
test-suite/tests/eval.test	diff1 \|	diff2 \|	blob \| history
test-suite/tests/goops.test	diff1 \|	diff2 \|	blob \| history

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