]> git.sur5r.net Git - i3/i3/commit
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)
commit6241419c86602a999a4766c24edb7b884395e433
tree01b317a84d19bbf0200753a40047855d030b32dd
parentf55b7977e8fca2c2cf9b84c56ca5ee04afef8078
parent8a7a80e22e14882a8b41bb2ff0979534426bcf0e
Merge branch 'master' into next
src/config_parser.c