]> git.sur5r.net Git - i3/i3/commit - libi3/ucs2_conversion.c
Merge branch 'drawing' into next (Thanks fernandotcl)
authorMichael Stapelberg <michael@stapelberg.de>
Mon, 21 Nov 2011 21:48:34 +0000 (21:48 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Mon, 21 Nov 2011 21:49:07 +0000 (21:49 +0000)
commit32e58e7b39fc02035d3db712283436f194e46b4f
treea9b12cacfc655dfacf518be1517a4ace91fec985
parent70151ea238926555ea9f80230f53069b8e5b143b
parent561cf3719fd293f3dd4e7b22fc92d8e0a22ae1d6
Merge branch 'drawing' into next (Thanks fernandotcl)

(from the 'less code duplication & more uniform behavior' department)