]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d83b1f7 32e2180)
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 27 Jun 2013 22:14:30 +0000 (00:14 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 27 Jun 2013 22:14:30 +0000 (00:14 +0200)
1  2 
i3-nagbar/main.c patch | diff1 | diff2 | blob | history

diff --cc i3-nagbar/main.c
Simple merge
A better tiling and dynamic window manager