]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 24 Aug 2011 14:58:47 +0000 (16:58 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 24 Aug 2011 14:58:47 +0000 (16:58 +0200)
commitc527497a4be64ff8d91d7978211db9358f9cef11
tree491b0f03b6033ded2c591c79b4f1248b121b9c9a
parentff85023b0862126958d3db5d1acaf3cb2229459b
parentb31948aecb50b923f77eacf9de33a2c9856bf1ff
Merge branch 'master' into next
src/floating.c