# HG changeset patch
# User Franz Glasner <hg@dom66.de>
# Date 1512924099 -3600
# Node ID 2c2d0daa31a2d58cf3404333c5d0c966f9872af9
# Parent  05c6f16908decf4df96d074c741e2421b4923398# Parent  a3cb9ed08a83c50009cc2ae121aaf4c2bd7d2d50
MERGE: The latest changes from upstream: just an "ignore"

diff -r 05c6f16908de -r 2c2d0daa31a2 Makefile