Merge remote-tracking branches 'github/merge-requests/581', 'github/merge-requests...
authorKlaus Ethgen <Klaus@Ethgen.de>
Mon, 22 Jan 2018 20:07:11 +0000 (21:07 +0100)
committerKlaus Ethgen <Klaus@Ethgen.de>
Mon, 22 Jan 2018 20:07:11 +0000 (21:07 +0100)
commitc5342c6c03b5ba03b5c49d2c9d1af248b4faa1b2
tree7ba64b3c16d96cfba0ab30e4532446be8279f4a3
parenta58676634b1432605e3a4330c3395d62a6c90b88
parentf4f5b4d16d060d05d0f75706f5f25e9d64ded083
parentd7a361f47742cdf1c6e8a45abbb2090a80c37a42
parent43d72f3fb0a1cd95eb4ec24162409e6781ee963d
parent0a0e941e69f783292ab1c485d8894e1d551a35f1
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.