Fix merge.
authorMatt Birkholz <matt@birchwood-abbey.net>
Sat, 20 May 2017 17:57:03 +0000 (10:57 -0700)
committerMatt Birkholz <matt@birchwood-abbey.net>
Sat, 20 May 2017 17:57:03 +0000 (10:57 -0700)
commitb161d03357b464d96a41fe2cf9140d7a3d18f66d
treeb93e97cf2cef13ee79cfecf6168260ebbffdd1a5
parent1aaf5a69a91ac517df6025a848a5016f37cc1fe8
Fix merge.
19 files changed:
debian/changelog
doc/user-manual/user.texinfo
src/blowfish/NEWS
src/gdbm/NEWS
src/gdbm/gdbm-check.sh
src/gdbm/gdbm.pkg
src/gdbm/optiondb.scm
src/glib/gio.scm
src/mcrypt/NEWS
src/mcrypt/mcrypt.scm
src/md5/Makefile.am
src/md5/NEWS
src/md5/make.scm
src/mhash/NEWS
src/mhash/make.scm
src/runtime/crypto.scm
src/runtime/optiondb.scm
src/x11-screen/configure.ac
tests/ffi/test-ffi-wrapper.scm