]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 29 Mar 2015 15:46:37 +0000 (17:46 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 29 Mar 2015 15:46:37 +0000 (17:46 +0200)
commit6d94231f745bfa9c85c8cec8bf862cdfcc8a07d7
treeb9fdc1f3de1e725ed95d1c55099f722ccecc3513
parentb8057392c496cff75c7a62db2d4dafb280ebf502
parent33069ff1d548947003bf8dc780d74dbcd91ea7f9
Merge branch 'master' into next