Fix merge.
authorMatt Birkholz <matt@birchwood-abbey.net>
Sun, 30 Apr 2017 01:41:45 +0000 (18:41 -0700)
committerMatt Birkholz <matt@birchwood-abbey.net>
Sun, 30 Apr 2017 01:41:45 +0000 (18:41 -0700)
commit43ac82bf0a517fd5e4bc2cea7179f6d13f437483
treedfa5b11749c4648f6850235b7a0ca9f8d73ef285
parent494a58c10d06ae9361ad5343a9fbfb99860787df
Fix merge.
src/glib/gio.scm
src/glib/glib.pkg
src/mcrypt/mcrypt.scm
src/md5/make.scm
src/md5/md5.scm
src/mhash/make.scm
src/mhash/mhash.scm
src/runtime/make.scm