birchwood-abbey.net Git - mit-scheme.git/commit

projects / mit-scheme.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 368e2f1 0784fc0)

author	Matt Birkholz <puck@birchwood-abbey.net>
	Fri, 13 Mar 2015 17:41:00 +0000 (10:41 -0700)
committer	Matt Birkholz <puck@birchwood-abbey.net>
	Fri, 13 Mar 2015 17:41:00 +0000 (10:41 -0700)
commit	c22f1e7f99000cb8774d4e90b6036ac7c7e1fda1
tree	ffb94897e3f8a6dffc83fc8dea3dab936eaa7644	tree \| snapshot
parent	368e2f15c2674610c3324b0e8e548fdde7dcd373	commit \| diff
parent	0784fc0a15d3c4427eb97ff0615b63064049df9a	commit \| diff

Merge branch 'Gtk-Screen' into SMP-Gtk.

18 files changed:

doc/user-manual/user.texinfo	diff1 \|	diff2 \|	blob \| history
src/edwin/edwin.pkg	diff1 \|	diff2 \|	blob \| history
src/edwin/os2term.scm	diff1 \|	diff2 \|	blob \| history
src/edwin/tterm.scm	diff1 \|	diff2 \|	blob \| history
src/edwin/win32.scm	diff1 \|	diff2 \|	blob \| history
src/edwin/xterm.scm	diff1 \|	diff2 \|	blob \| history
src/microcode/cmpauxmd/i386.m4	diff1 \|	diff2 \|	blob \| history
src/microcode/cmpauxmd/x86-64.m4	diff1 \|	diff2 \|	blob \| history
src/microcode/osio.h	diff1 \|	diff2 \|	blob \| history
src/microcode/prosio.c	diff1 \|	diff2 \|	blob \| history
src/microcode/pruxffi.c	diff1 \|	diff2 \|	blob \| history
src/microcode/uxio.c	diff1 \|	diff2 \|	blob \| history
src/microcode/uxsig.c	diff1 \|	diff2 \|	blob \| history
src/runtime/ffi.scm	diff1 \|	diff2 \|	blob \| history
src/runtime/io.scm	diff1 \|	diff2 \|	blob \| history
src/runtime/process.scm	diff1 \|	diff2 \|	blob \| history
src/runtime/runtime.pkg	diff1 \|	diff2 \|	blob \| history
src/runtime/thread.scm	diff1 \|	diff2 \|	blob \| history

MIT/GNU Scheme, Pucked