]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 12 Feb 2012 10:21:01 +0000 (10:21 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 12 Feb 2012 10:21:01 +0000 (10:21 +0000)
1  2 
i3-config-wizard/main.c

Simple merge