From a62c48c7bd46c4e193738c7d391c529c528ee4dc Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Wed, 18 Jul 2012 22:06:41 +0200
Subject: slideshow: -D and -R need not be mutually exclusive

---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index ba6faaa..bcde5bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ git HEAD
       <https://github.com/derf/feh/issues/91>
     * menu: simpler background, remove drop shadows
     * Remove --menu-style support (deprecated in 1.12)
+    * Allow --slideshow-delay and --reload to be used together
 
 Sun, 25 Mar 2012 13:13:26 +0200  Daniel Friesel <derf@finalrewind.org>
 
-- 
cgit v1.2.3