From: Matt Birkholz <puck@birchwood-abbey.net>
Date: Sun, 29 May 2016 17:18:22 +0000 (-0700)
Subject: Merge branch 'master' into Gtk.
X-Git-Tag: mit-scheme-pucked-9.2.12~323
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=8b305ef1a01b1421be543ffd16001f9e982d51a9;p=mit-scheme.git

Merge branch 'master' into Gtk.
---

8b305ef1a01b1421be543ffd16001f9e982d51a9
diff --cc dist/shared.sh
index a7ea1776a,e3f73488e..59041f787
--- a/dist/shared.sh
+++ b/dist/shared.sh
@@@ -100,7 -100,7 +100,7 @@@ LIARC_OUT=${OUTPUT_DIR}/liar
  NATIVE_OUT=${OUTPUT_DIR}/native
  MACOSX_OUT=${OUTPUT_DIR}/macosx
  
- PLUGINS="blowfish gdbm mcrypt md5 mhash gtk gl"
 -PLUGINS="blowfish gdbm mcrypt md5 mhash x11 x11-screen"
++PLUGINS="blowfish gdbm mcrypt md5 mhash x11 x11-screen gtk gl"
  
  notify ()
  {