Merge branch 'master' into Gtk.
authorMatt Birkholz <puck@birchwood-abbey.net>
Sat, 12 Nov 2016 20:40:48 +0000 (13:40 -0700)
committerMatt Birkholz <puck@birchwood-abbey.net>
Sat, 12 Nov 2016 20:40:48 +0000 (13:40 -0700)
commit53d9c3ad695940ce33fd4d68fb7f5248abee378d
treeaf942adf76a7ba3d6cbec287e77f19bd406e2883
parent758a2fb400c9c6f51335bdd2fa9038638ad1a841
parentf44a44c0f9ad512f7786f66c632a4705e31f68b7
Merge branch 'master' into Gtk.
19 files changed:
src/Makefile.in
src/blowfish/Makefile.am
src/blowfish/configure.ac
src/configure.ac
src/etc/optiondb.scm
src/gdbm/Makefile.am
src/gdbm/configure.ac
src/mcrypt/Makefile.am
src/mcrypt/configure.ac
src/md5/Makefile.am
src/md5/configure.ac
src/mhash/Makefile.am
src/mhash/configure.ac
src/runtime/load.scm
src/x11-screen/Makefile.am
src/x11-screen/configure.ac
src/x11/Makefile.am
src/x11/configure.ac
src/x11/x11.pkg