Merge branch 'master' into Gtk.
authorMatt Birkholz <matt@birchwood-abbey.net>
Tue, 9 Aug 2016 20:45:18 +0000 (13:45 -0700)
committerMatt Birkholz <matt@birchwood-abbey.net>
Tue, 9 Aug 2016 20:45:18 +0000 (13:45 -0700)
commitaccb16d97932c4e9fec4d7b5ec99eca88114e2c4
tree1be018e0a710e9416693524024279c32a223172f
parent372d5ca92ac9d4b4ac4d5a7aecc00b11588816e5
parent8dc9dd07967cbd8282622745eba89487a671c032
Merge branch 'master' into Gtk.
src/blowfish/Makefile.am
src/edwin/editor.scm
src/edwin/edwin.pkg
src/gdbm/Makefile.am
src/mcrypt/Makefile.am
src/md5/Makefile.am
src/mhash/Makefile.am
src/runtime/ed-ffi.scm
src/runtime/runtime.pkg
src/x11-screen/Makefile.am
src/x11/Makefile.am