]> git.sur5r.net Git - i3/i3lock/commitdiff
projects / i3 / i3lock / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 105a86d d91c20a)
Merge pull request #24 from ixjlyons/timeout-doc
authorMichael Stapelberg <stapelberg@users.noreply.github.com>
Fri, 3 Jul 2015 06:30:44 +0000 (23:30 -0700)
committerMichael Stapelberg <stapelberg@users.noreply.github.com>
Fri, 3 Jul 2015 06:30:44 +0000 (23:30 -0700)
Indicate that the --inactivity-timeout option takes an argument.


Trivial merge
improved screen locker