HCoop Git - bpt/guile.git/commit

HCoop / bpt / guile.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c413507 dc686d7)

author	Andy Wingo <wingo@pobox.com>
	Mon, 12 Jan 2009 20:36:39 +0000 (21:36 +0100)
committer	Andy Wingo <wingo@pobox.com>
	Mon, 12 Jan 2009 20:36:39 +0000 (21:36 +0100)
commit	c32929d14d40f9e00c3fd10d3f51d54733ebf687
tree	c803163a177580b5a8506052a18664a48504ba00	tree \| snapshot (tar.gz zip)
parent	c41350777d6faf05f80627f97ca01cd5c8fac47b	commit \| diff
parent	dc686d7b0a1490e26482e018489dec040b79b952	commit \| diff

Merge commit 'origin/master' into vm

Conflicts:

.gitignore
guile-tools.in
srfi/srfi-19.scm

13 files changed:

.gitignore	diff1 \|	diff2 \|	blob \| history
Makefile.am	diff1 \|	diff2 \|	blob \| history
configure.in	diff1 \|	diff2 \|	blob \| history
doc/Makefile.am	diff1 \|	diff2 \|	blob \| history
doc/ref/api-debug.texi	diff1 \|	diff2 \|	blob \| history
libguile/Makefile.am	diff1 \|	diff2 \|	blob \| history
libguile/goops.c	diff1 \|	diff2 \|	blob \| history
libguile/goops.h	diff1 \|	diff2 \|	blob \| history
libguile/threads.c	diff1 \|	diff2 \|	blob \| history
module/ice-9/debugging/Makefile.am	diff1 \|	diff2 \|	blob \| history
module/ice-9/gds-client.scm	diff1 \|	diff2 \|	blob \| history
module/srfi/srfi-19.scm	diff1 \|	diff2 \|	blob \| history
module/srfi/srfi-34.scm	diff1 \|	diff2 \|	blob \| history

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