]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'next' into testcases
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 21 Aug 2009 09:45:59 +0000 (11:45 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 21 Aug 2009 09:45:59 +0000 (11:45 +0200)
Conflicts:
docs/userguide

1  2 
docs/userguide

diff --cc docs/userguide
Simple merge