Merge pull request #160 from astiob/be

author Grigori Goronzy <greg@kinoho.net>

Tue, 23 Jun 2015 20:36:16 +0000 (22:36 +0200)

committer Grigori Goronzy <greg@kinoho.net>

Tue, 23 Jun 2015 20:36:16 +0000 (22:36 +0200)
author Grigori Goronzy <greg@kinoho.net>
Tue, 23 Jun 2015 20:36:16 +0000 (22:36 +0200)
committer Grigori Goronzy <greg@kinoho.net>
Tue, 23 Jun 2015 20:36:16 +0000 (22:36 +0200)
diff --cc libass/ass_bitmap.c
Simple merge
diff --cc libass/ass_render.c
Simple merge
author	Grigori Goronzy <greg@kinoho.net>
	Tue, 23 Jun 2015 20:36:16 +0000 (22:36 +0200)
committer	Grigori Goronzy <greg@kinoho.net>
	Tue, 23 Jun 2015 20:36:16 +0000 (22:36 +0200)
		1	2
libass/ass_bitmap.c	patch \|	diff1 \|	diff2 \|	blob \| history
libass/ass_render.c	patch \|	diff1 \|	diff2 \|	blob \| history