HCoop Git - bpt/guile.git/commit

HCoop / bpt / guile.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a1aae2c 60617d8)

author	Andy Wingo <wingo@pobox.com>
	Fri, 7 Feb 2014 14:01:33 +0000 (15:01 +0100)
committer	Andy Wingo <wingo@pobox.com>
	Fri, 7 Feb 2014 14:03:17 +0000 (15:03 +0100)
commit	dc7a33fa871c42d0474602f3560d3ce350e1f1c3
tree	37495605b40c19ca83decd2b191fdb31510531b9	tree \| snapshot (tar.gz zip)
parent	a1aae2c3a03afc542ab6a7c6672c5a645ac77b09	commit \| diff
parent	60617d819d77a1b92ed6c557a0b49b8e9a8e97b9	commit \| diff

Merge commit '60617d819d77a1b92ed6c557a0b49b8e9a8e97b9'

Conflicts:
libguile/continuations.c
libguile/eval.c
libguile/goops.c
libguile/instructions.c

libguile/backtrace.c	diff1 \|	diff2 \|	blob \| history
libguile/debug.c	diff1 \|	diff2 \|	blob \| history
libguile/eval.c	diff1 \|	diff2 \|	blob \| history
libguile/frames.c	diff1 \|	diff2 \|	blob \| history
libguile/goops.c	diff1 \|	diff2 \|	blob \| history
libguile/ports.c	diff1 \|	diff2 \|	blob \| history
libguile/strings.c	diff1 \|	diff2 \|	blob \| history
libguile/strports.c	diff1 \|	diff2 \|	blob \| history
libguile/throw.c	diff1 \|	diff2 \|	blob \| history

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