# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1462569141 14400
# Node ID 318883c78fd399506102be1b51ad0a01175bc7c9
# Parent  6586202b3a87dfeab97796c2f300f70b357263c7# Parent  44f7664689f2ce10d5444768a743a6a3961e3497
maint: Merge stable to default.

diff -r 6586202b3a87 -r 318883c78fd3 libinterp/corefcn/__magick_read__.cc
diff -r 6586202b3a87 -r 318883c78fd3 libinterp/corefcn/module.mk
diff -r 6586202b3a87 -r 318883c78fd3 libinterp/dldfcn/module-files
diff -r 6586202b3a87 -r 318883c78fd3 libinterp/module.mk