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)
commit3b4293e0783ce68f6e9c1e0130230dbf79cc6811
treed9c571d8323c7328d770e52e50c3ee9809ba7ea2
parent4c922a8233d9f992fb5d7dccdaa9717dac55af29
parentd26c972b0d48515166a2ec49c477377d1ac5dfa7
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.