From d030c17f644cc726fca6d2216473cfc831185b0f Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Mon, 6 Jul 2015 20:02:02 +0200
Subject: allow --sort and --randomize to override each other (issue #199)

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 985906c..5aa4196 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@ git HEAD
       (patch by James Knight)
     * when removing the last image in slidsehow mode, stay on the last
       (previously second-to-last) image (patch by Lior Shiponi)
+    * Allow --sort and --randomize to override each other (most recently
+      specified option wins) instead of always preferring --sort
 
 Sun, 24 May 2015 11:45:18 +0200
 
-- 
cgit v1.2.3