# HG changeset patch
# User Klaus Ethgen <Klaus@Ethgen.de>
# Date 1516651631 -3600
# Node ID 70457fceb02c82f768df72ebbdc09bc2eb113d26
# Parent  88b48668094bddec9c90acc2b00a56d29f9765e3# Parent  79b668de97df4018d9e378d0e606efec73ed69a5
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 88b48668094b -r 70457fceb02c src/Makefile.am
--- a/src/Makefile.am	Thu Jan 04 14:28:10 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 88b48668094b -r 70457fceb02c src/renderer-tiles.c