Mercurial > hg > forks > geeqie
changeset 2711:70457fceb02c
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.
author | Klaus Ethgen <Klaus@Ethgen.de> |
---|---|
date | Mon, 22 Jan 2018 21:07:11 +0100 |
parents | 88b48668094b (current diff) 79b668de97df (diff) |
children | d7f6f1ce57eb |
files | src/Makefile.am src/renderer-tiles.c |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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 "/*" > $@