]> git.sur5r.net Git - i3/i3/commit
Merge branch 'hacking-howto' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 23 Nov 2011 21:54:52 +0000 (21:54 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 23 Nov 2011 21:54:52 +0000 (21:54 +0000)
commit52d000f45e1e8665b29bde866a4a483fd21df353
tree240dd13e7f4e650ae98928641c0e807c24ee6826
parent26750e7abc05c2f30d8d8a67bee081a4eaedfaaa
parentf91f6c52e97fb0c8dfa6a7f85a35462e6d97ce6d
Merge branch 'hacking-howto' into next