From 0b92fc3ba2bb6d06d5e8ed1b0904599370778f5f Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Sun, 4 Nov 2018 22:43:43 +0100
Subject: Update changelog

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

diff --git a/ChangeLog b/ChangeLog
index 33d21de..d99c578 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 git HEAD
 
     * Remove deprecated webcam scripts (feh-cam and gen-cam-menu)
+    * Remove deprecated collage mode (-c/--collage)
+    * flip and rotation (keys "<", ">", "|", and "_") no longer change the
+      underlying file. This leaves delete ("Ctrl+Delete") as the only
+      destructive action which is enabled by default
+    * Add option --edit, which makes flip and rotation change the underlying
+      file as well as the displayed image. This was the default behaviour in
+      feh 1.x and 2.x
 
 Sat, 27 Oct 2018 19:46:48 +0200  Daniel Friesel <derf+feh@finalrewind.org>
 
-- 
cgit v1.2.3