Merge branch 'master' into pucked.
authorMatt Birkholz <matt@birchwood-abbey.net>
Tue, 6 Aug 2019 06:37:21 +0000 (23:37 -0700)
committerMatt Birkholz <matt@birchwood-abbey.net>
Tue, 6 Aug 2019 06:37:21 +0000 (23:37 -0700)
commit376be64fd8ecfa18ea96af3bc773e1693a19f734
tree91e20f25b08f9d1be8592c11d76c2c2343a2e302
parent9bd552b9f554d8ebb0e561cf4c706e7175ec73bb
parentfe14ace2fa2bfea5d4c9f7ce613434db1c73cda1
Merge branch 'master' into pucked.
src/blowfish/Makefile.am
src/blowfish/configure.ac
src/gdbm/Makefile.am
src/imail/Makefile.am
src/mcrypt/Makefile.am
src/pgsql/Makefile.am
src/x11/Makefile.am