Merge pull request #84 from astiob/msvc

author Grigori Goronzy <greg@kinoho.net>

Tue, 22 Sep 2015 21:07:02 +0000 (23:07 +0200)

committer Grigori Goronzy <greg@kinoho.net>

Tue, 22 Sep 2015 21:07:02 +0000 (23:07 +0200)
author Grigori Goronzy <greg@kinoho.net>
Tue, 22 Sep 2015 21:07:02 +0000 (23:07 +0200)
committer Grigori Goronzy <greg@kinoho.net>
Tue, 22 Sep 2015 21:07:02 +0000 (23:07 +0200)
diff --cc libass/ass_fontselect.c
Simple merge
diff --cc libass/ass_utils.c
Simple merge
diff --cc libass/ass_utils.h
Simple merge
author	Grigori Goronzy <greg@kinoho.net>
	Tue, 22 Sep 2015 21:07:02 +0000 (23:07 +0200)
committer	Grigori Goronzy <greg@kinoho.net>
	Tue, 22 Sep 2015 21:07:02 +0000 (23:07 +0200)
		1	2
libass/ass_fontselect.c	patch \|	diff1 \|	diff2 \|	blob \| history
libass/ass_utils.c	patch \|	diff1 \|	diff2 \|	blob \| history
libass/ass_utils.h	patch \|	diff1 \|	diff2 \|	blob \| history