]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 2 Apr 2013 21:59:48 +0000 (23:59 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 2 Apr 2013 21:59:48 +0000 (23:59 +0200)
commit0b000b1464d88a067495e26130693273e85220fe
tree95c2cce7ffe582c8cc6406f121d36fc3859cf789
parent2926ddb69f5101e117e5830ebcd1380e9da3154c
parent4f72c5c5fc62a8ff4ed0bfc177ca53058581295a
Merge branch 'master' into next
src/con.c