]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 17 Sep 2011 13:13:05 +0000 (14:13 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 17 Sep 2011 13:13:05 +0000 (14:13 +0100)
commit7a38d8ac56b61e9582af8eb5d0449fc89a795c71
treec70905d92a79cbe1b158a7df4a02f9d2ba2df42c
parent5a85c9efd2e77a1c113d00760aa6f5cccc61f406
parent18129cf0b005b679f1da1777c8861dfede17c86e
Merge branch 'master' into next
src/floating.c