update the changelog/readme for 2.6

diff --git a/CHANGELOG b/CHANGELOG
index 514229caaf3240829e17180a4074b2b0522175e9..bb1684a260c82bb5c172d937f48b15e9fbd6d82e 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,17 @@
+2014-07-18 i3lock 2.6
+
+ • NEW DEPENDENCY: use libxkbcommon-x11 instead of libX11
+   This helps us get rid of all code that directly uses libX11
+ • Use cairo_status_to_string for descriptive errors.
+ • Add `-e` option to not validate empty password.
+ • Bugfix: update the initial keyboard modifier state (Thanks lee, Ran)
+ • Re-raise i3lock when obscured in a separate process
+ • Turn on the screen on successful authentication
+ • Delay to turn off the screen after wrong passwd
+ • Discard half-entered passwd after some inactivity
+ • Ignore empty passwd after repeated Enter keypress
+ • Scale the unlock indicator (for retina displays)
+
 2013-06-09 i3lock 2.5
 
  • NEW DEPENDENCY: Use libxkbcommon for input handling

diff --git a/README b/README
index 41c1e4a809d78ba2bb7265c3b4347d83ac0af832..6b9fb6b414fbb5b4d751abcf65e478bfaa827eba 100644 (file)
--- a/README
+++ b/README
@@ -29,7 +29,8 @@ Requirements
 - libx11-dev
 - libx11-xcb-dev
 - libxkbfile-dev
-- libxkbcommon >= 0.2.0
+- libxkbcommon >= 0.4.0
+- libxkbcommon-x11 >= 0.4.0
 
 Running i3lock
 -------------