commit f31562974a6ce25a962bc836bec3f482d734e277 parent cf6b6ee989774f92fd27e64129a69bbb89c0bdea Author: Chris Guillott <chris@techfo.xyz> Date: Mon, 27 Nov 2017 14:43:42 -0500 Merge remote-tracking branch 'upstream/master' Diffstat:
| M | CHANGELOG | | | 10 | ++++++++++ |
| M | I3LOCK_VERSION | | | 2 | +- |
2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG @@ -1,3 +1,13 @@ +2017-11-25 i3lock 2.10 + + • Only use -lpam when not on OpenBSD (Thanks Kaashif) + • locale: treat empty string same as unset (Thanks Ran) + • Fix overwrite of getopt optind (Thanks jakob) + • Immediately hide the unlock indicator after ESC / C-u (Thanks Orestis) + • Measure wall-clock time instead of CPU time for “locking” indicator. + • SetInputFocus to the i3lock window to force-close context menus + • Use RandR for learning about attached monitors + 2017-06-21 i3lock 2.9.1 • Fix version number mechanism (for --version) diff --git a/I3LOCK_VERSION b/I3LOCK_VERSION @@ -1 +1 @@ -2.9.1-non-git +2.10-non-git