From 7088bdb302f5fa3f734aac7b20d0ebc24e063955 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Tue, 2 Aug 2011 18:52:53 +0200
Subject: Update Changelog

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

diff --git a/ChangeLog b/ChangeLog
index 0924004..03ec370 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,15 @@ git HEAD
 
     * Respect --image-bg option in full-screen mode
 
+    [Patches by Yu-Jie Lin]
+
+    * Add scroll by page actions
+    * Allow combination of multiple key modifiers
+    * Fix option pair bug in theme config
+      <https://github.com/derf/feh/issues/49>
+    * Allow Shift modifier in key config
+      <https://github.com/derf/feh/issues/30>
+
 Mon, 04 Jul 2011 14:46:36 +0200  Daniel Friesel <derf@finalrewind.org>
 
 * Release v1.14.2
-- 
cgit v1.2.3