]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 28 Jun 2014 11:05:40 +0000 (13:05 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 28 Jun 2014 11:05:40 +0000 (13:05 +0200)
commit02794015289e749be71e60e9533a405b05317452
tree3f6f678196f4bb5719d5d9b5644544d257f7e3fe
parent2d28273cac9643f6a6e71b3f434ac1318238d686
parentb5f3679a667ad9a641353c9895500709b9a4359f
Merge branch 'master' into next
src/x.c