projects / mit-scheme.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c922a8 d26c972)
Merge branch 'Gtk-Screen' into Gtk. End the Gtk-Screen branch!
authorMatt Birkholz <puck@birchwood-abbey.net>
Sat, 6 Feb 2016 18:31:17 +0000 (11:31 -0700)
committerMatt Birkholz <puck@birchwood-abbey.net>
Sat, 6 Feb 2016 18:31:17 +0000 (11:31 -0700)
The only conflict was caused by unwinding and re-committing the patch
for src/gtk/swat-pole-zero AFTER it was merged with Gtk-Screen.


Trivial merge
MIT/GNU Scheme, Pucked