]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0e46f17 4021c54)
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 24 Aug 2011 16:49:40 +0000 (18:49 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 24 Aug 2011 16:49:40 +0000 (18:49 +0200)
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