]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 28 Sep 2012 22:03:42 +0000 (00:03 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 28 Sep 2012 22:03:42 +0000 (00:03 +0200)
commit72c66a2091659c0a986a627bdb3b766628437553
tree95e8046316ad716aa882c950f4afec0713ab2f47
parent43d486441d11c51078a6bf8b1ba2653216664c71
parent01ce4bbc92c1b634d004c6fcd0b8cfd046eb2fe0
Merge branch 'master' into next
src/con.c
src/x.c