]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a6a1d55 014aa7f)
Merge branch 'master' of https://github.com/ton/i3 into ton-master
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 1 Mar 2015 15:50:37 +0000 (16:50 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 1 Mar 2015 15:50:37 +0000 (16:50 +0100)
1  2 
libi3/font.c patch | diff1 | diff2 | blob | history

diff --cc libi3/font.c
Simple merge
A better tiling and dynamic window manager