]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 4 Sep 2012 18:21:31 +0000 (20:21 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 4 Sep 2012 18:21:31 +0000 (20:21 +0200)
commit65e5bcfdf4c44845dadf057a6bde1f15db3381ff
tree41f4d59ec21de9fe2a130d00287e94f94ce94466
parent73d5dcbbafddf4fd31350df7b56ae0e8bdd20128
parent562c53d66c4a3d2e41334d5293a868c7b390383f
Merge branch 'master' into next
src/handlers.c