]> granicus.if.org Git - libass/commitdiff
Merge branch 'fonts'
authorGrigori Goronzy <greg@chown.ath.cx>
Mon, 7 Sep 2015 09:40:54 +0000 (11:40 +0200)
committerGrigori Goronzy <greg@chown.ath.cx>
Mon, 7 Sep 2015 09:40:54 +0000 (11:40 +0200)
1  2 
libass/ass_render.c
libass/ass_utils.c

Simple merge
Simple merge