]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 45d5f1f d43a91e)
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Mon, 19 Mar 2012 20:42:08 +0000 (21:42 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Mon, 19 Mar 2012 20:42:08 +0000 (21:42 +0100)
1  2 
i3bar/src/xcb.c patch | diff1 | diff2 | blob | history

diff --cc i3bar/src/xcb.c
Simple merge
A better tiling and dynamic window manager