# HG changeset patch
# User Klaus Ethgen <Klaus@Ethgen.de>
# Date 1516651631 -3600
# Node ID cac6dcf7e2e72f0ac5f470e46f35f3cbb2f00baa
# Parent  b4543cadf55f3a4247a18f9d2160f38d1586a21f# Parent  d7f6f1ce57ebeaf78caed79364f7921c5237ff8d
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 b4543cadf55f -r cac6dcf7e2e7 src/Makefile.am
--- a/src/Makefile.am	Mon Jan 22 01:21:49 2018 +0100
+++ b/src/Makefile.am	Mon Jan 22 21:07:11 2018 +0100
@@ -64,7 +64,7 @@
 	 echo '#ifndef UI_ICONS_H'; \
 	 echo '#define UI_ICONS_H'; echo; \
 	 $(GDK_PIXBUF_CSOURCE) --raw --extern --build-list $(ICON_PAIRS); \
-	 echo '#endif /* UI_ICONS_H */'" > $@ || echo "!!! Failed to generate $@ !!!"
+	 echo '#endif /* UI_ICONS_H */'" > $@ || { echo "!!! Failed to generate $@ !!!"; exit 1; }
 
 ClayRGB1998_icc.h: ClayRGB1998.icc
 	echo "/*" > $@
diff -r b4543cadf55f -r cac6dcf7e2e7 src/print.c
diff -r b4543cadf55f -r cac6dcf7e2e7 src/remote.c
diff -r b4543cadf55f -r cac6dcf7e2e7 src/renderer-tiles.c