]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 17 Dec 2011 14:22:57 +0000 (14:22 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 17 Dec 2011 14:22:57 +0000 (14:22 +0000)
commitef224cdb988f9d8ba4d98f66f1a38e5fe80ba3cd
tree99928d8637b10d6899b106b676f8c4e14f53c8e8
parent5a345db18bc92e23a54db16840412cd74b618d1d
parent6694a201eb50a8093b5e71a616793b133e3f1313
Merge branch 'master' into next

Conflicts:
testcases/t/173-get-marks.t
testcases/t/111-goto.t
testcases/t/173-get-marks.t