HCoop Git - bpt/guile.git/commit - GUILE-VERSION

HCoop / bpt / guile.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 146b8f8 abd731f)

author	Andy Wingo <wingo@pobox.com>
	Tue, 24 Jul 2012 21:22:41 +0000 (23:22 +0200)
committer	Andy Wingo <wingo@pobox.com>
	Tue, 24 Jul 2012 21:22:41 +0000 (23:22 +0200)
commit	4bfe73072b75259a97a9daa81ed5c9c01e8a4af5
tree	23e6211d8b371f385eb72657c41c8a2af12779c2	tree \| snapshot (tar.gz zip)
parent	146b8f85e10e3abdffcb44e6131958a68acdccbc	commit \| diff
parent	abd731fff772624f54cdf69597b4cf36df9ae0e4	commit \| diff

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

Conflicts:
GUILE-VERSION

.gitignore	diff1 \|	diff2 \|	blob \| history
GUILE-VERSION	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
doc/ref/srfi-modules.texi	diff1 \|	diff2 \|	blob \| history
libguile/Makefile.am	diff1 \|	diff2 \|	blob \| history
m4/gnulib-cache.m4	diff1 \|	diff2 \|	blob \| history
module/Makefile.am	diff1 \|	diff2 \|	blob \| history
module/ice-9/psyntax-pp.scm	diff1 \|	diff2 \|	blob \| history
module/ice-9/psyntax.scm	diff1 \|	diff2 \|	blob \| history

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