From: Michael Stapelberg <stapelberg@users.noreply.github.com>
Date: Fri, 3 Jul 2015 06:30:44 +0000 (-0700)
Subject: Merge pull request #24 from ixjlyons/timeout-doc
X-Git-Tag: 2.8~13
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3lock;a=commitdiff_plain;h=c5bb1d55e00df320033469eceb81ec03d8a52d80

Merge pull request #24 from ixjlyons/timeout-doc

Indicate that the --inactivity-timeout option takes an argument.
---

c5bb1d55e00df320033469eceb81ec03d8a52d80