]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 24 Aug 2011 20:43:15 +0000 (22:43 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 24 Aug 2011 20:43:15 +0000 (22:43 +0200)
commit62e9eab4e5efb490d1abcb15678e7efab4b8e16c
tree6eafed3ac5ef3fbcf3e0fd0c24c0fd5151359416
parenteacbf986a00fc284ae19a7347b83441c16e6d004
parentf26dd1a7b16354b5d74c7376814e2ab4dbecbcf8
Merge branch 'master' into next

Conflicts:
src/floating.c
src/floating.c