HCoop Git - bpt/guile.git/commit

HCoop / bpt / guile.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4105f68 53bdfcf)

author	Andy Wingo <wingo@pobox.com>
	Mon, 30 Apr 2012 19:34:58 +0000 (21:34 +0200)
committer	Andy Wingo <wingo@pobox.com>
	Mon, 30 Apr 2012 19:34:58 +0000 (21:34 +0200)
commit	4d497b629b73afda35ba409c3dcbfb665fe41dde
tree	50c50532046f5573d4fcaf2af5047fe4c2d4b0c2	tree \| snapshot (tar.gz zip)
parent	4105f688e33e592534b809c048451d94db82681a	commit \| diff
parent	53bdfcf03418c4709127140d64f12ede970c174b	commit \| diff

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

Conflicts:
libguile/vm-engine.c
libguile/vm-i-system.c

libguile/_scm.h	diff1 \|	diff2 \|	blob \| history
libguile/values.c	diff1 \|	diff2 \|	blob \| history
libguile/vm-engine.c	diff1 \|	diff2 \|	blob \| history
libguile/vm-engine.h	diff1 \|	diff2 \|	blob \| history
libguile/vm-i-scheme.c	diff1 \|	diff2 \|	blob \| history
libguile/vm-i-system.c	diff1 \|	diff2 \|	blob \| history
libguile/vm.c	diff1 \|	diff2 \|	blob \| history

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