]> git.sur5r.net Git - i3/i3/commit
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)
commit3f126c61c409550c9af080a9813de9480ae0eaf7
treea2f21d6913fe9ad86d30e0c093d5ccde59f8003f
parentdd5be77d1dcc7e7eb40ce1c33f985816fc0b8f79
parent20dc3271a73adae6f6d9f160d29caec28a3693d0
Merge branch 'master' into next
parser-specs/config.spec
src/config_directives.c
testcases/t/201-config-parser.t