HCoop Git - bpt/guile.git/commit

HCoop / bpt / guile.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 110ef00 9f17d96)

author	Mark H Weaver <mhw@netris.org>
	Mon, 7 Jan 2013 22:23:26 +0000 (17:23 -0500)
committer	Mark H Weaver <mhw@netris.org>
	Mon, 7 Jan 2013 22:23:26 +0000 (17:23 -0500)
commit	e0c211bb2e80605b4ae3fb121c34136f6e266b70
tree	15d7e55519b83b124c836443d6045df78e3ad2ba	tree \| snapshot (tar.gz zip)
parent	110ef00ba1dfae4461afdd189fed4dfec05ee137	commit \| diff
parent	9f17d967c9b108f856776c035462e93017a6e7e2	commit \| diff

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

Conflicts:
GUILE-VERSION
libguile/posix.c
module/ice-9/eval.scm
test-suite/tests/cse.test

19 files changed:

configure.ac	diff1 \|	diff2 \|	blob \| history
libguile/dynl.c	diff1 \|	diff2 \|	blob \| history
libguile/eval.c	diff1 \|	diff2 \|	blob \| history
libguile/load.c	diff1 \|	diff2 \|	blob \| history
libguile/memoize.c	diff1 \|	diff2 \|	blob \| history
libguile/numbers.c	diff1 \|	diff2 \|	blob \| history
libguile/posix.c	diff1 \|	diff2 \|	blob \| history
libguile/procs.c	diff1 \|	diff2 \|	blob \| history
libguile/socket.c	diff1 \|	diff2 \|	blob \| history
libguile/values.c	diff1 \|	diff2 \|	blob \| history
m4/gnulib-cache.m4	diff1 \|	diff2 \|	blob \| history
module/Makefile.am	diff1 \|	diff2 \|	blob \| history
module/ice-9/boot-9.scm	diff1 \|	diff2 \|	blob \| history
module/ice-9/eval.scm	diff1 \|	diff2 \|	blob \| history
module/language/tree-il/cse.scm	diff1 \|	diff2 \|	blob \| history
module/web/server.scm	diff1 \|	diff2 \|	blob \| history
test-suite/tests/cse.test	diff1 \|	diff2 \|	blob \| history
test-suite/tests/eval.test	diff1 \|	diff2 \|	blob \| history
test-suite/tests/tree-il.test	diff1 \|	diff2 \|	blob \| history

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