# HG changeset patch
# User Klaus Ethgen <Klaus@Ethgen.de>
# Date 1516651631 -3600
# Node ID d7f6f1ce57ebeaf78caed79364f7921c5237ff8d
# Parent  6aef3ede2ec5bd8c0b6d3bfdcb7595ec2b7509d2# Parent  70457fceb02c82f768df72ebbdc09bc2eb113d26
Merge remote-tracking branches 'github/merge-requests/581', 'github/merge-requests/576', 'github/merge-requests/574' and 'github/merge-requests/573'

* github/merge-requests/581:
  Fix crash after strange behaviour of the "Really Continue" dialog

* github/merge-requests/576:
  Trap build errors

* github/merge-requests/574:
  Fix spelling mistake occured/occurred

* github/merge-requests/573:
  Partially fix #561: Hi-DPI-aware rendering of images.

diff -r 6aef3ede2ec5 -r d7f6f1ce57eb src/print.c
diff -r 6aef3ede2ec5 -r d7f6f1ce57eb src/remote.c
diff -r 6aef3ede2ec5 -r d7f6f1ce57eb src/renderer-tiles.c