]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 29 Jan 2012 18:02:48 +0000 (18:02 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 29 Jan 2012 18:02:48 +0000 (18:02 +0000)
1  2 
src/randr.c

diff --cc src/randr.c
Simple merge