HCoop Git - bpt/guile.git/commit

HCoop / bpt / guile.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4d497b6 33672b0)

author	Andy Wingo <wingo@pobox.com>
	Tue, 8 May 2012 20:43:04 +0000 (22:43 +0200)
committer	Andy Wingo <wingo@pobox.com>
	Tue, 8 May 2012 20:43:04 +0000 (22:43 +0200)
commit	a3ded46520b35a8dbda22097b74792b8282d12ce
tree	9af4c888be060263851d602031dc162023e1d55e	tree \| snapshot (tar.gz zip)
parent	4d497b629b73afda35ba409c3dcbfb665fe41dde	commit \| diff
parent	33672b071118f54ee637afa00349f2a4404a84da	commit \| diff

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

Conflicts:
libguile/ports.c
libguile/ports.h
libguile/read.c
libguile/vm-i-system.c

configure.ac	diff1 \|	diff2 \|	blob \| history
libguile/fports.c	diff1 \|	diff2 \|	blob \| history
libguile/ports.c	diff1 \|	diff2 \|	blob \| history
libguile/ports.h	diff1 \|	diff2 \|	blob \| history
libguile/read.c	diff1 \|	diff2 \|	blob \| history
libguile/vm-i-system.c	diff1 \|	diff2 \|	blob \| history

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