]> git.sur5r.net Git - i3/i3/commit
resolve merge conflict
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 30 Mar 2010 11:09:00 +0000 (13:09 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 30 Mar 2010 11:09:00 +0000 (13:09 +0200)
commit66d862474e70f116f6f777ac25d97fc3a62f0c01
tree2c89bd4228bb3b1d1436e55869c87197541a08a3
parent96128c9cfbda0029775cabaa22b82b97a0a1f2f3
resolve merge conflict
src/workspace.c