HCoop Git - bpt/guile.git/commit

HCoop / bpt / guile.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: bfe35b9 52b680f)

author	Andy Wingo <wingo@pobox.com>
	Mon, 19 Dec 2011 17:00:28 +0000 (18:00 +0100)
committer	Andy Wingo <wingo@pobox.com>
	Mon, 19 Dec 2011 17:00:28 +0000 (18:00 +0100)
commit	296004b3ba34139292eb1d8bf54739ee1a082712
tree	149e2c87f169583ade59bbb876530fc03af9b2ea	tree \| snapshot (tar.gz zip)
parent	bfe35b90ff0c7f78335e70bdb26ea3466f6e98d9	commit \| diff
parent	52b680f85e84689778f10ed8f9e72adf8316fbe7	commit \| diff

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

Conflicts:
libguile/feature.c
m4/gnulib-cache.m4
module/ice-9/deprecated.scm
module/language/tree-il/peval.scm

.gitignore	diff1 \|	diff2 \|	blob \| history
libguile/feature.c	diff1 \|	diff2 \|	blob \| history
libguile/foreign.c	diff1 \|	diff2 \|	blob \| history
libguile/init.c	diff1 \|	diff2 \|	blob \| history
libguile/vm-i-scheme.c	diff1 \|	diff2 \|	blob \| history
m4/gnulib-cache.m4	diff1 \|	diff2 \|	blob \| history
module/ice-9/deprecated.scm	diff1 \|	diff2 \|	blob \| history
module/language/tree-il/peval.scm	diff1 \|	diff2 \|	blob \| history
test-suite/tests/tree-il.test	diff1 \|	diff2 \|	blob \| history

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