]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 10 Feb 2012 00:03:18 +0000 (00:03 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 10 Feb 2012 00:03:18 +0000 (00:03 +0000)
commit2daa8d422ae63d55e4b952070e8e894c0963618f
treebdb9ce63966f8bdec53c9912ff2812bd824fc380
parent2f8d3d3390e8225fac12b0bde716a836f1fbf963
parent138197f925392b7629c0dd1dc1ccd274179a9c2d
Merge branch 'master' into next

Conflicts:
i3-config-wizard/main.c
i3-config-wizard/main.c