]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 24 Jan 2013 13:45:14 +0000 (14:45 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 24 Jan 2013 13:45:14 +0000 (14:45 +0100)
1  2 
src/config.c

diff --cc src/config.c
Simple merge