Merge branch 'master' into Gtk.
authorMatt Birkholz <puck@birchwood-abbey.net>
Thu, 17 Nov 2016 23:39:28 +0000 (16:39 -0700)
committerMatt Birkholz <puck@birchwood-abbey.net>
Thu, 17 Nov 2016 23:39:28 +0000 (16:39 -0700)
commit7229238978b79604f93dc23564927608f652e223
tree884cec961f9a388839918d53a08fd782954bfd9d
parent141935a2f36c1875912b6611f6c51864f90973b0
parent03a97f825763e843dca7661897c75c71bb616022
Merge branch 'master' into Gtk.
14 files changed:
src/blowfish/Makefile.am
src/blowfish/configure.ac
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/x11-screen/Makefile.am
src/x11-screen/configure.ac
src/x11/Makefile.am
src/x11/configure.ac