HCoop Git - bpt/guile.git/commit

HCoop / bpt / guile.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6871327 803c087)

author	Mark H Weaver <mhw@netris.org>
	Fri, 13 Sep 2013 04:24:04 +0000 (00:24 -0400)
committer	Mark H Weaver <mhw@netris.org>
	Fri, 13 Sep 2013 04:24:04 +0000 (00:24 -0400)
commit	c04bf4337b88ea45641065b7fe70dd0973b8ce94
tree	53e2d02477e40bd1da5a45cc3240ea1420691777	tree \| snapshot (tar.gz zip)
parent	6871327742d3e1a0966aa8fed04c911311c12c2a	commit \| diff
parent	803c087e6b72f59ed9e529c1e1ca4fbe34e8eda5	commit \| diff

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

Conflicts:
module/srfi/srfi-9.scm
module/web/server.scm

doc/ref/api-io.texi	diff1 \|	diff2 \|	blob \| history
module/ice-9/boot-9.scm	diff1 \|	diff2 \|	blob \| history
module/ice-9/psyntax.scm	diff1 \|	diff2 \|	blob \| history
module/srfi/srfi-9.scm	diff1 \|	diff2 \|	blob \| history
module/web/server.scm	diff1 \|	diff2 \|	blob \| history

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