]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 31 Jan 2015 21:56:08 +0000 (22:56 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 31 Jan 2015 21:56:08 +0000 (22:56 +0100)
1  2 
parser-specs/config.spec
src/config_directives.c
testcases/t/201-config-parser.t

Simple merge
Simple merge
Simple merge