HCoop Git - bpt/guile.git/commit - libguile/print.c

HCoop / bpt / guile.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 747747e 2874f66)

author	Andy Wingo <wingo@pobox.com>
	Fri, 22 Jun 2012 11:18:02 +0000 (13:18 +0200)
committer	Andy Wingo <wingo@pobox.com>
	Fri, 22 Jun 2012 11:18:02 +0000 (13:18 +0200)
commit	0dd7c5407599b65a1a3da4b9bd8feccc715b51f7
tree	7e54c75087c5ea3f876bcb54cc49c70ec87ae0b5	tree \| snapshot (tar.gz zip)
parent	747747ee06ac64c224b91e8f64f810a1159c1675	commit \| diff
parent	2874f66017b7bfae256e85af84689d00ecc418ab	commit \| diff

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

Conflicts:
libguile/deprecated.c
libguile/ports.c
libguile/ports.h
libguile/strports.c
test-suite/tests/cse.test

libguile/foreign.c	diff1 \|	diff2 \|	blob \| history
libguile/ports.c	diff1 \|	diff2 \|	blob \| history
libguile/ports.h	diff1 \|	diff2 \|	blob \| history
libguile/print.c	diff1 \|	diff2 \|	blob \| history
libguile/strings.c	diff1 \|	diff2 \|	blob \| history
libguile/strports.c	diff1 \|	diff2 \|	blob \| history
module/language/tree-il/cse.scm	diff1 \|	diff2 \|	blob \| history
module/language/tree-il/primitives.scm	diff1 \|	diff2 \|	blob \| history
test-suite/tests/cse.test	diff1 \|	diff2 \|	blob \| history
test-suite/tests/foreign.test	diff1 \|	diff2 \|	blob \| history

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