]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f989467 8f2e225)
Merge branch 'fix-yajl1-warnings'
authorMichael Stapelberg <michael@stapelberg.de>
Mon, 16 Jul 2012 17:24:33 +0000 (19:24 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Mon, 16 Jul 2012 17:24:33 +0000 (19:24 +0200)

Trivial merge
A better tiling and dynamic window manager