From 8899df700027280ad34c7ee64f2aadfc3ae8e6c8 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Wed, 14 Mar 2012 20:30:30 +0100
Subject: changelog

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

diff --git a/ChangeLog b/ChangeLog
index 170e89b..6d21cd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+git HEAD
+
+    * Add R, * and / aliases for <keypad begin>, <keypad *> and <keypad />
+    * Try to convert unloadable files with imagemagick for up to 6 seconds
+    * Add --magick-timeout option to set imagemagick conversion timeout or
+      disable it altogether
+    * Clean up temporary / to-delete files when receiveng SIG{INT,TERM,QUIT}
+
 Tue, 06 Mar 2012 13:13:35 +0100  Daniel Friesel <derf@finalrewind.org>
 
 * Release v2.4
-- 
cgit v1.2.3