Merge branch 'master' into Gtk.
authorMatt Birkholz <puck@birchwood-abbey.net>
Thu, 9 Jun 2016 03:43:40 +0000 (20:43 -0700)
committerMatt Birkholz <puck@birchwood-abbey.net>
Thu, 9 Jun 2016 03:43:40 +0000 (20:43 -0700)
commit3c374401bf6ffa2127b3d89edeb04913622b5fab
treeac38215f9ea92b7a6cb49e3bbb8c82f1aeb444d4
parentbbaa1c01172853ef908899db321c10d817194077
parent5bf5e595647ed691c35e325ab18c51fe716eee01
Merge branch 'master' into Gtk.
src/blowfish/Makefile.am
src/gdbm/Makefile.am
src/mcrypt/Makefile.am
src/md5/Makefile.am
src/mhash/Makefile.am
src/x11-screen/Makefile.am
src/x11/Makefile.am