]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 24 Jun 2014 07:01:59 +0000 (09:01 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 24 Jun 2014 07:01:59 +0000 (09:01 +0200)
commita6c6e3e3a0efdcc5423a876fff22525b5da378c3
treeb0afe155ecf6efd9cb10b5c20561c022dd9b402e
parentcbd51ce6642be4e1163a64dce8ec20a454f1bf05
parente83b0ad64dc9df28711a3af543ef30052b03f8c9
Merge branch 'master' into next
src/manage.c