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

HCoop / bpt / guile.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8806b4c 679eea4)

author	Andy Wingo <wingo@pobox.com>
	Tue, 6 Dec 2011 18:14:50 +0000 (19:14 +0100)
committer	Andy Wingo <wingo@pobox.com>
	Tue, 6 Dec 2011 18:14:50 +0000 (19:14 +0100)
commit	04ec290f8b3e6bd6297fb10391ea7e885a55a786
tree	b36dd4f7dd85dcf30c64900b9972433a54e2b4cd	tree \| snapshot (tar.gz zip)
parent	8806b4c28a7919b236d10751ebcb15f4a503b08c	commit \| diff
parent	679eea4f0ef7720e0ed3c9ba3fddedf35d1501d6	commit \| diff

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

Conflicts:
libguile/deprecation.c
libguile/load.c
libguile/print.c

libguile/deprecation.c	diff1 \|	diff2 \|	blob \| history
libguile/gc-malloc.c	diff1 \|	diff2 \|	blob \| history
libguile/load.c	diff1 \|	diff2 \|	blob \| history
libguile/numbers.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
module/ice-9/boot-9.scm	diff1 \|	diff2 \|	blob \| history

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