]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 28 Sep 2012 16:24:04 +0000 (18:24 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 28 Sep 2012 16:24:04 +0000 (18:24 +0200)
commitcd2a1267c8de435219d3808a71b7a09288ad3585
tree3accdf4257dab60730c72da12b1dc32b7062ef3a
parenta2daf229fbd8318b4f6e7bf6900f2c5c5fec76c8
parent6553ecf46d7e1bfdd0d94b2ed4eef81e96c2178a
Merge branch 'master' into next
src/floating.c