From d665f6aeb68def39f123ef4b2f0df5e101fb4265 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Tue, 28 Aug 2012 11:37:09 +0200
Subject: Do not enable imagemagick by default

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 76f5cd9..8f758fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,9 @@ git HEAD
       (consequence: lossless rotate no longer works for such files)
     * --reload now accepts rational numbers
     * Fix --filelist trying to load .txt files with imagemagick
+    * imagemagick support is now disabled by default, to make feh behaviour
+      less confusing. Set --magick-timeout to a non-negative value to enable
+      it (--magick-timeout 5 for feh-2.5 behaviour)
 
 Sun, 25 Mar 2012 13:13:26 +0200  Daniel Friesel <derf@finalrewind.org>
 
-- 
cgit v1.2.3