]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 29 Jun 2013 21:47:29 +0000 (23:47 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 29 Jun 2013 21:47:29 +0000 (23:47 +0200)
1  2 
src/config_parser.c

Simple merge