]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 7 Jan 2012 18:50:46 +0000 (18:50 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 7 Jan 2012 18:50:46 +0000 (18:50 +0000)
commit470ee00012ccb05db9e0255a38376bffa25dd9b2
tree43a3445924843f312ac574a841430ba4ea533ef0
parent634512404940fb4b1effc930feb8b108883cef60
parent3ce7f03f02bb5b7a696ddc26cf10cc8a90509206
Merge branch 'master' into next
src/con.c