]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Mon, 26 Sep 2011 19:12:07 +0000 (20:12 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Mon, 26 Sep 2011 19:12:07 +0000 (20:12 +0100)
commitdb33da225842fe8c3be296b48aba6e9d1bbe0c0d
tree321069265a9342afe4473ea466fc1891a552ee0e
parent683bfa58d52ca698b286963bc4c8da71d1b37f84
parent6ce2f4d3948196153917d94686c9092c35bcd885
Merge branch 'master' into next
src/ipc.c