]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 11 Aug 2011 20:22:44 +0000 (22:22 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 11 Aug 2011 20:22:44 +0000 (22:22 +0200)
commitd3efa73dd7fe985aae8c9792f2201496745a018d
tree17ad93b1fd1628002c956ad0483fc341aa96d255
parent9ccb3987adefc8cb5ec908f9bc008a925c2c7d88
parent79479617c7c2f03f05f1d389515d6267cb55a1bb
Merge branch 'master' into next
src/workspace.c