HCoop Git - bpt/guile.git/commit

HCoop / bpt / guile.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 61989c7 306cc01)

author	Mark H Weaver <mhw@netris.org>
	Thu, 9 Jan 2014 06:32:32 +0000 (01:32 -0500)
committer	Mark H Weaver <mhw@netris.org>
	Thu, 9 Jan 2014 07:52:34 +0000 (02:52 -0500)
commit	1df515a077f26d59510e48fad3d45a33d2c90e0f
tree	05991bb4b3d527390d036fbb17617d6905097bda	tree \| snapshot (tar.gz zip)
parent	61989c705359c50c61d7f52392f244d386218298	commit \| diff
parent	306cc01d3981feaa11aa0d866ff1d99128f0ace3	commit \| diff

Merge branch 'stable-2.0'

Conflicts:
module/system/vm/traps.scm
test-suite/tests/peval.test

13 files changed:

doc/ref/api-data.texi	diff1 \|	diff2 \|	blob \| history
libguile/load.c	diff1 \|	diff2 \|	blob \| history
libguile/numbers.c	diff1 \|	diff2 \|	blob \| history
libguile/numbers.h	diff1 \|	diff2 \|	blob \| history
libguile/read.c	diff1 \|	diff2 \|	blob \| history
libguile/socket.c	diff1 \|	diff2 \|	blob \| history
module/ice-9/boot-9.scm	diff1 \|	diff2 \|	blob \| history
module/ice-9/psyntax-pp.scm	diff1 \|	diff2 \|	blob \| history
module/ice-9/psyntax.scm	diff1 \|	diff2 \|	blob \| history
module/language/tree-il/peval.scm	diff1 \|	diff2 \|	blob \| history
module/system/vm/traps.scm	diff1 \|	diff2 \|	blob \| history
test-suite/tests/peval.test	diff1 \|	diff2 \|	blob \| history
test-suite/tests/syntax.test	diff1 \|	diff2 \|	blob \| history

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