]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 21 Mar 2012 19:24:29 +0000 (20:24 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 21 Mar 2012 19:24:29 +0000 (20:24 +0100)
commite09e077b763bb1ff1975998c87d017afa9c319c3
tree3dddbbe38956d95e27aebbaef3c823431ee4fa69
parent2abfb5a88b24546eb481129fd8532b0aabb8e581
parent7997fd667be5ed6fa41775418685c5a062809f60
Merge branch 'master' into next
src/floating.c