]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 17 Dec 2011 15:28:51 +0000 (15:28 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 17 Dec 2011 15:28:51 +0000 (15:28 +0000)
commitdb174234ce41c3ac317ef25d5fff323540295e9a
tree29b4f6d25a772b4b487be009a0ed9c8ccca99edd
parentef224cdb988f9d8ba4d98f66f1a38e5fe80ba3cd
parentfcfdfedcb55cc7609975979a0d71ea5c76618b3b
Merge branch 'master' into next

Conflicts:
debian/changelog
testcases/t/100-fullscreen.t