From: Matt Birkholz <matt@birkholz.chandler.az.us>
Date: Sun, 15 Sep 2013 05:47:03 +0000 (-0700)
Subject: Merge branch 'Gtk' into Gtk-Screen.
X-Git-Tag: mit-scheme-pucked-9.2.12~366^2~29
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=c4778cb15c4635db12689a89df31d35405bd1fa2;p=mit-scheme.git

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

c4778cb15c4635db12689a89df31d35405bd1fa2
diff --cc src/TAGS
index 18815ae6d,e0668593b..bc04cc883
--- a/src/TAGS
+++ b/src/TAGS
@@@ -15,6 -15,4 +15,9 @@@ cref/TAGS,includ
  
  rcs/TAGS,include
  
++<<<<<<< HEAD
 +imail/TAGS,include
 +
++=======
++>>>>>>> e15962eff9573c3e57401773ef469d514789414e
  ffi/TAGS,include