From: Klaus Ethgen <Klaus@Ethgen.de>
Date: Mon, 22 Jan 2018 20:07:11 +0000 (+0100)
Subject: Merge remote-tracking branches 'github/merge-requests/581', 'github/merge-requests... 
X-Git-Tag: v1.5~181
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=c5342c6c03b5ba03b5c49d2c9d1af248b4faa1b2

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.
---

c5342c6c03b5ba03b5c49d2c9d1af248b4faa1b2