# HG changeset patch
# User Klaus Ethgen <Klaus@Ethgen.de>
# Date 1516651631 -3600
# Node ID e0251a8eba95918a67d692d086f5b498ab45a003
# Parent  3040da7c5c3572940a6655c57d51fe641ad89c46# Parent  cac6dcf7e2e72f0ac5f470e46f35f3cbb2f00baa
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 3040da7c5c35 -r e0251a8eba95 src/Makefile.am
--- a/src/Makefile.am	Mon Jan 22 13:25:41 2018 +0000
+++ 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 3040da7c5c35 -r e0251a8eba95 src/print.c
diff -r 3040da7c5c35 -r e0251a8eba95 src/remote.c
diff -r 3040da7c5c35 -r e0251a8eba95 src/renderer-tiles.c