HCoop Git - bpt/guile.git/commit

HCoop / bpt / guile.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 91ee751 9b0975f)

author	Andy Wingo <wingo@pobox.com>
	Mon, 30 Jan 2012 17:25:07 +0000 (18:25 +0100)
committer	Andy Wingo <wingo@pobox.com>
	Mon, 30 Jan 2012 17:25:07 +0000 (18:25 +0100)
commit	855db1905d56efcdf91ae51a9e80990f79030eae
tree	9c918dba899ddae458147ce1095018fcbdec18b0	tree \| snapshot (tar.gz zip)
parent	91ee7515da0bad91330ce5c87b250d6cf12a2789	commit \| diff
parent	9b0975f1dc41ddd10d81fb5b0965b9e9a54ef37a	commit \| diff

Merge commit '9b0975f1dc41ddd10d81fb5b0965b9e9a54ef37a'

Conflicts:
libguile/foreign.c
module/ice-9/psyntax-pp.scm
module/ice-9/psyntax.scm

13 files changed:

.gitignore	diff1 \|	diff2 \|	blob \| history
doc/ref/srfi-modules.texi	diff1 \|	diff2 \|	blob \| history
doc/ref/vm.texi	diff1 \|	diff2 \|	blob \| history
libguile/filesys.c	diff1 \|	diff2 \|	blob \| history
libguile/fluids.c	diff1 \|	diff2 \|	blob \| history
libguile/foreign.c	diff1 \|	diff2 \|	blob \| history
libguile/print.c	diff1 \|	diff2 \|	blob \| history
libguile/strings.c	diff1 \|	diff2 \|	blob \| history
libguile/threads.c	diff1 \|	diff2 \|	blob \| history
libguile/values.c	diff1 \|	diff2 \|	blob \| history
m4/gnulib-cache.m4	diff1 \|	diff2 \|	blob \| history
module/ice-9/boot-9.scm	diff1 \|	diff2 \|	blob \| history
module/ice-9/psyntax.scm	diff1 \|	diff2 \|	blob \| history

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