]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 28 Jun 2014 11:01:48 +0000 (13:01 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 28 Jun 2014 11:01:48 +0000 (13:01 +0200)
commit2d28273cac9643f6a6e71b3f434ac1318238d686
treeb2a376c076a499bdb2d6997a5f3ad92abee3a9aa
parent01a2c5a3f16be97f1afe9cb40d802c4f8deed86c
parenta1f6bfbf7e48f919c4c850778b7dd4ee8cb235c9
Merge branch 'master' into next
src/manage.c