]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7d2978e 8e8b9b9)
Merge branch 'fix-yajl-warning' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 26 Aug 2011 21:33:40 +0000 (23:33 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 26 Aug 2011 21:33:40 +0000 (23:33 +0200)

Trivial merge
A better tiling and dynamic window manager