# HG changeset patch
# User Franz Glasner <hg@dom66.de>
# Date 1510355625 -3600
# Node ID 05c6f16908decf4df96d074c741e2421b4923398
# Parent  f364d1d48c3e940fa12d74cf88ccc4af25a188a4# Parent  16556170d9cd029f3fd65dd94fc1211e5f6b6b22
MERGE: the latest head from branch "origin": keep the local copy

diff -r f364d1d48c3e -r 05c6f16908de Makefile