]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 18 Dec 2011 17:25:15 +0000 (17:25 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 18 Dec 2011 17:25:15 +0000 (17:25 +0000)
commitc4298b9311ecbf7921c21d15b34f96c9af929bc3
tree4574b7470d123432421193c1d23f6a833c1339fc
parentfbf6d20e05f5ba4b92d838972bea25f11a6c8227
parent7eb2ca405eb3829e016bf7ecfd8df3f3fbea8d77
Merge branch 'master' into next
src/handlers.c