]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 28 Aug 2011 13:47:35 +0000 (15:47 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 28 Aug 2011 13:47:35 +0000 (15:47 +0200)
commit16188af8bf24ecdd82c36ba41524a5c02fba97a6
treeec40ac15df01c84870969265b19739392a1a01ef
parentf269d8523228fb98cb5bbbfd3ed8997a8c223eff
parentc96b5a12a7894714308fcddec4023726438d1b34
Merge branch 'master' into next
src/floating.c