]> git.sur5r.net Git - i3/i3/commit - include/resize.h
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 21 Dec 2013 20:32:55 +0000 (21:32 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 21 Dec 2013 20:32:55 +0000 (21:32 +0100)
commitb2c91f54abe6ab6af225dbdc987918c1f449dc0c
tree38ca5fcb9335994875aa4094669e393b19c41e4e
parentbfe32ad797a107e4d77897a49bb7094ac82c48f6
parent95af0fdcac564b16fcf687d5a0401dce098436ba
Merge branch 'master' into next