]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 1 Jan 2013 15:31:27 +0000 (16:31 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 1 Jan 2013 15:31:27 +0000 (16:31 +0100)
commit2c249b6949566fe9e2414d86b26bf5d29c7c1a6b
tree824d6f2cf1f6c2da2edb6dba7a3908f4a2aaa11d
parent6856b232d69cf676375df3e128955b72056e500a
parentc394efbfd014bc92ed0eefffd51b98e0a850d6fd
Merge branch 'master' into next
src/manage.c