Merge branch 'master' into next

[i3/i3] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 2e006168536593d1b7f3190255c1cd0b991c7f2b..349911075937184436ce0e2cca77fae7afd44b48 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,12 @@
+i3-wm (4.1.1-0) unstable; urgency=low
+
+  * NOT YET RELEASED
+
+ -- Michael Stapelberg <michael@stapelberg.de>  Fri, 11 Nov 2011 23:00:04 +0000
+
 i3-wm (4.1-1) unstable; urgency=low
 
+  * Switch to dpkg-source 3.0 (quilt) and compat level 7
   * Implement system tray support in i3bar (for NetworkManager, Skype, …)
   * i3bar is now configurable in the i3 configfile
   * Implement support for PCRE regular expressions in criteria