]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 18 Dec 2011 18:02:08 +0000 (18:02 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 18 Dec 2011 18:02:08 +0000 (18:02 +0000)
commit1f2c9306a27cced83ad960e929bb9e9a163b7843
tree7b4eb620e0f571c20071e43264f3f40eeb6314c4
parentc4298b9311ecbf7921c21d15b34f96c9af929bc3
parent32fb917948858799531aaa2aa4b21346c79afb0b
Merge branch 'master' into next

Conflicts:
testcases/t/159-socketpaths.t
docs/ipc
docs/userguide
man/i3.man
src/util.c
testcases/t/159-socketpaths.t