]> git.sur5r.net Git - i3/i3/commit - libi3/font.c
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 1 Mar 2015 15:50:49 +0000 (16:50 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 1 Mar 2015 15:50:49 +0000 (16:50 +0100)
commit0876bd621f91fdb8d7e7c649e6a6973accb9c95b
treee8a02f0d60ca0e7c1193084ba42a289fc9c8fced
parent24a5a952b971cbf79096f8ec70f5e3b343dcb46c
parent21bb44b6da4ac576ca04d1b000b754c2699b066b
Merge branch 'master' into next