HCoop Git - bpt/guile.git/commit

HCoop / bpt / guile.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ac0e91c 89bc270)

author	Andy Wingo <wingo@pobox.com>
	Tue, 30 Sep 2008 19:12:16 +0000 (21:12 +0200)
committer	Andy Wingo <wingo@pobox.com>
	Tue, 30 Sep 2008 19:12:16 +0000 (21:12 +0200)
commit	999f1b26e74a7a8eb9e9e5e479f971e145aa7326
tree	5f80e3cdf6f70d5fae969d5350d17111365efc41	tree \| snapshot (tar.gz zip)
parent	ac0e91c42dac01b74f89260090273cdb7ff7e791	commit \| diff
parent	89bc270db3c207b2210736f066ce18721e0dbc76	commit \| diff

Merge commit 'origin/master' into vm

Conflicts:

doc/Makefile.am
ice-9/Makefile.am
libguile/gc.c

15 files changed:

Makefile.am	diff1 \|	diff2 \|	blob \| history
configure.in	diff1 \|	diff2 \|	blob \| history
doc/Makefile.am	diff1 \|	diff2 \|	blob \| history
ice-9/Makefile.am	diff1 \|	diff2 \|	blob \| history
libguile/Makefile.am	diff1 \|	diff2 \|	blob \| history
libguile/continuations.c	diff1 \|	diff2 \|	blob \| history
libguile/debug.c	diff1 \|	diff2 \|	blob \| history
libguile/eval.c	diff1 \|	diff2 \|	blob \| history
libguile/gc-freelist.c	diff1 \|	diff2 \|	blob \| history
libguile/init.c	diff1 \|	diff2 \|	blob \| history
libguile/load.c	diff1 \|	diff2 \|	blob \| history
libguile/macros.c	diff1 \|	diff2 \|	blob \| history
libguile/modules.c	diff1 \|	diff2 \|	blob \| history
libguile/procs.c	diff1 \|	diff2 \|	blob \| history
scripts/Makefile.am	diff1 \|	diff2 \|	blob \| history

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