HCoop Git - bpt/guile.git/commit

HCoop / bpt / guile.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f29c300 f4b7d91)

author	Andy Wingo <wingo@pobox.com>
	Mon, 25 Jul 2011 16:26:37 +0000 (18:26 +0200)
committer	Andy Wingo <wingo@pobox.com>
	Mon, 25 Jul 2011 16:26:37 +0000 (18:26 +0200)
commit	ab4bc85398a14b62b58694bab83c63be286b2fd5
tree	84bfe7b0b6064016bcfadb76ec95d07410654fe8	tree \| snapshot (tar.gz zip)
parent	f29c300507da21a667f5b82e75300f8009eab9cc	commit \| diff
parent	f4b7d918eff9770f09893b023fd834f5c0bc33d1	commit \| diff

Merge remote-tracking branch 'origin/stable-2.0'

Conflicts:
GUILE-VERSION
test-suite/tests/srfi-4.test

.gitignore	diff1 \|	diff2 \|	blob \| history
GUILE-VERSION	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
libguile/bytevectors.c	diff1 \|	diff2 \|	blob \| history
libguile/goops.c	diff1 \|	diff2 \|	blob \| history
libguile/read.c	diff1 \|	diff2 \|	blob \| history
libguile/threads.c	diff1 \|	diff2 \|	blob \| history
module/ice-9/boot-9.scm	diff1 \|	diff2 \|	blob \| history
module/oop/goops.scm	diff1 \|	diff2 \|	blob \| history

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