]> git.sur5r.net Git - i3/i3/commit
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)
commit4da54f12797fac971054d94da7de81208b36a69f
tree212c8920b4894dc31dbdf68fceaf90d5fbac9c5c
parent5b6bcb48f02090323d42092f87bd5a682e7bc33a
parent74a6c7532db8ac3ef5dcdfe6df97a3101e895e82
Merge branch 'next' into testcases

Conflicts:
docs/userguide
docs/userguide