]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Mon, 29 Aug 2011 13:17:53 +0000 (15:17 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Mon, 29 Aug 2011 13:17:53 +0000 (15:17 +0200)
commit1a34d250bb5551d641e9fb762ec323506034bfce
tree041c3fc239b2713f3c581d3a74db41bae8cad306
parenta4804a53b8ecf5e5f7d6ee9266cd8d9501e090df
parent04a886e4eefdd239c271afa59b0ef579e5e03a55
Merge branch 'master' into next
docs/userguide