]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 28 Aug 2011 15:41:23 +0000 (17:41 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 28 Aug 2011 15:41:23 +0000 (17:41 +0200)
commit57e7266da4d5576878375a722f0f186e70fc2ee3
tree0a2e15901433c7267091a4deb415c649904be490
parentf0a0236b7b4ac57bc9155edf438e90ea44715778
parent3950aa730cd2a9564da46bdcf59f127f6a78b511
Merge branch 'master' into next
src/ipc.c