HCoop Git - bpt/guile.git/commit

HCoop / bpt / guile.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 178a409 95ed221)

author	Mark H Weaver <mhw@netris.org>
	Tue, 16 Jul 2013 05:33:27 +0000 (01:33 -0400)
committer	Mark H Weaver <mhw@netris.org>
	Tue, 16 Jul 2013 05:33:27 +0000 (01:33 -0400)
commit	28d5d2537c0321643c3b511a2195cd491204e7f2
tree	16b46ded431848672722595b87024fb7ffc48142	tree \| snapshot (tar.gz zip)
parent	178a40928ab5221f6ce57c5af1067abe30a342b3	commit \| diff
parent	95ed221785f5b1203e998823455f682c1830498b	commit \| diff

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

Conflicts:
libguile/keywords.c
libguile/vm.c

15 files changed:

doc/ref/api-control.texi	diff1 \|	diff2 \|	blob \| history
doc/ref/api-macros.texi	diff1 \|	diff2 \|	blob \| history
libguile/eval.c	diff1 \|	diff2 \|	blob \| history
libguile/keywords.c	diff1 \|	diff2 \|	blob \| history
libguile/numbers.c	diff1 \|	diff2 \|	blob \| history
libguile/posix.c	diff1 \|	diff2 \|	blob \| history
libguile/socket.c	diff1 \|	diff2 \|	blob \| history
libguile/threads.c	diff1 \|	diff2 \|	blob \| history
libguile/vm-engine.c	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
module/ice-9/boot-9.scm	diff1 \|	diff2 \|	blob \| history
module/ice-9/eval.scm	diff1 \|	diff2 \|	blob \| history
test-suite/tests/foreign.test	diff1 \|	diff2 \|	blob \| history

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