]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 17 Dec 2011 22:35:13 +0000 (22:35 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 17 Dec 2011 22:35:13 +0000 (22:35 +0000)
commit4412ccbe5a4fad8a4cd594e6f10f937515a4d37c
treefdd7a00c6d4e020c91786519cdee07e52df110b8
parent0d210277f0f511d8850c712dc0c87a27bf20e2a0
parent386477b789660014efed5f6647716e4e52147201
Merge branch 'master' into next
src/config.c