Merge fixes; minimize differences with master.
authorMatt Birkholz <matt@birchwood-abbey.net>
Wed, 7 Aug 2019 21:06:42 +0000 (14:06 -0700)
committerMatt Birkholz <matt@birchwood-abbey.net>
Wed, 7 Aug 2019 21:06:42 +0000 (14:06 -0700)
commit4c7bce8bbc0328e7179d29bd0d24cba71bc400ab
tree11592bb5583c9ae614f7be1879907bf2fbe10903
parent5c55e0c9f249bbbbb2bf170970ef4f14134b72db
Merge fixes; minimize differences with master.
src/ffi/Makefile-fragment
src/mcrypt/mcrypt.pkg
src/x11-screen/x11-screen.pkg
src/x11-screen/x11-screen.scm