From 3a1b07272aeff6397f74014cdeae2c129d608a94 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Thu, 13 Sep 2012 12:05:55 +0200
Subject: Show error message if normal load failed (broken by 2.4) + update
 tests

---
 ChangeLog | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 4f12946..af57063 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-git HEAD
+Thu, 13 Sep 2012 12:00:06 +0200  Daniel Friesel <derf+feh@finalrewind.org>
 
     * Fix freedesktop.org Thumbnail Managing Standard implementation:
       when running feh on the current working directory, '/path/to/./image.png'
@@ -6,6 +6,8 @@ git HEAD
       '/path/to/image.png'
     * Show error message if lossless rotate / flip failed on non-JPEG image
     * Show error message if -O / -o failed to save image
+    * Show error message if load failed and magick is disabled (was broken
+      by feh 2.4)
 
 Tue, 28 Aug 2012 11:46:19 +0200  Daniel Friesel <derf+feh@finalrewind.org>
 
-- 
cgit v1.2.3