From: Matt Birkholz Date: Sat, 6 Feb 2016 18:31:17 +0000 (-0700) Subject: Merge branch 'Gtk-Screen' into Gtk. End the Gtk-Screen branch! X-Git-Tag: mit-scheme-pucked-9.2.12~366 X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=3b4293e0783ce68f6e9c1e0130230dbf79cc6811;p=mit-scheme.git Merge branch 'Gtk-Screen' into Gtk. End the Gtk-Screen branch! 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. --- 3b4293e0783ce68f6e9c1e0130230dbf79cc6811