]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 24 Jun 2014 07:57:05 +0000 (09:57 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 24 Jun 2014 07:57:05 +0000 (09:57 +0200)
commitb91cd347e4a40d6d160cb74f1adf61bb7bb9a2bc
tree7a9ab295c53481c504cf4792754a495e048c72a8
parent136b3e345bfde637d3270eafaa2d8aa3555cc3d5
parent0179f124d5c511874afdba4845ce9136edc58e63
Merge branch 'master' into next
src/main.c