HCoop Git - bpt/guile.git/commit

HCoop / bpt / guile.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c15d8e6 cd43fdc)

author	Andy Wingo <wingo@pobox.com>
	Tue, 25 Aug 2009 16:04:02 +0000 (18:04 +0200)
committer	Andy Wingo <wingo@pobox.com>
	Tue, 25 Aug 2009 16:04:02 +0000 (18:04 +0200)
commit	108e18b18abc066b2709a09283751e9138ccc935
tree	f55cf91309b7b069bc2f2d725fb788aa08870fa5	tree \| snapshot (tar.gz zip)
parent	c15d8e6ab9bf991ca55038fa895993bbb4c1efaa	commit \| diff
parent	cd43fdc5b7a7c851ee0f2b4e96a1f394fb50d869	commit \| diff

Merge wip-array refactor, up to cd43fdc5b7a7c

Conflicts:
NEWS
libguile/print.c

NEWS	diff1 \|	diff2 \|	blob \| history
libguile/Makefile.am	diff1 \|	diff2 \|	blob \| history
libguile/deprecated.c	diff1 \|	diff2 \|	blob \| history
libguile/gc-card.c	diff1 \|	diff2 \|	blob \| history
libguile/gc-malloc.c	diff1 \|	diff2 \|	blob \| history
libguile/gc-mark.c	diff1 \|	diff2 \|	blob \| history
libguile/print.c	diff1 \|	diff2 \|	blob \| history
libguile/read.c	diff1 \|	diff2 \|	blob \| history
libguile/socket.c	diff1 \|	diff2 \|	blob \| history
libguile/strings.c	diff1 \|	diff2 \|	blob \| history
module/Makefile.am	diff1 \|	diff2 \|	blob \| history

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