Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/mit-scheme

author Taylor R Campbell <campbell@mumble.net>

Sat, 13 Feb 2010 08:00:16 +0000 (03:00 -0500)

committer Taylor R Campbell <campbell@mumble.net>

Sat, 13 Feb 2010 08:00:16 +0000 (03:00 -0500)
author Taylor R Campbell <campbell@mumble.net>
Sat, 13 Feb 2010 08:00:16 +0000 (03:00 -0500)
committer Taylor R Campbell <campbell@mumble.net>
Sat, 13 Feb 2010 08:00:16 +0000 (03:00 -0500)
diff --cc src/compiler/machines/i386/dassm2.scm
Simple merge
diff --cc src/compiler/machines/i386/dassm3.scm
Simple merge
diff --cc src/microcode/configure.ac
Simple merge
diff --cc src/microcode/tparam.c
Simple merge
diff --cc src/microcode/tterm.c
Simple merge
author	Taylor R Campbell <campbell@mumble.net>
	Sat, 13 Feb 2010 08:00:16 +0000 (03:00 -0500)
committer	Taylor R Campbell <campbell@mumble.net>
	Sat, 13 Feb 2010 08:00:16 +0000 (03:00 -0500)
		1	2
src/compiler/machines/i386/dassm2.scm	patch \|	diff1 \|	diff2 \|	blob \| history
src/compiler/machines/i386/dassm3.scm	patch \|	diff1 \|	diff2 \|	blob \| history
src/microcode/configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/microcode/tparam.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/microcode/tterm.c	patch \|	diff1 \|	diff2 \|	blob \| history