]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 18 Sep 2011 16:44:00 +0000 (17:44 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 18 Sep 2011 16:44:00 +0000 (17:44 +0100)
commit05c0a8985b9d07f6100150e7c6dcff4ba7775b85
tree7766840890c9a00ea6de051a0278c0865686f147
parent46409ad656da15cb26cec7a2baf322f25fe7a65a
parent11ab7cf32ad80e548094192cb9bbff9e53dae1db
Merge branch 'master' into next
src/tree.c