]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 16 Aug 2011 23:52:45 +0000 (01:52 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 16 Aug 2011 23:52:45 +0000 (01:52 +0200)
commit2abe23d6ff8179b0d047a0bcdeff9c6b75bd89da
treed5cb0c877322a63807cf39fb2a302323d5fc3dc9
parent2f116df901f9eddcfe351d09de884dad72b75ee6
parent637d2a3d622dead4aa7b71746bcfbc0caed24bc9
Merge branch 'master' into next
src/main.c
src/manage.c