Merge with MPC-HC 6d1472b2f18266d92e5bc068667de348c0cd3b3b.
commitfde14dafcddc1bdb474cc38ac62d4e592326b919
authoryuzhuohuang@qq.com <yuzhuohuang@qq.com>
Wed, 17 Oct 2012 15:24:08 +0000 (17 23:24 +0800)
committerxy <yuzhuohuang@qq.com>
Mon, 19 Nov 2012 13:57:06 +0000 (19 21:57 +0800)
tree38c3f85c3df85336bc170ad924da39d14c74783c
parentf4023b540abdf4293a283e257359202e95e680db
Merge ... MPC-HC 6d1472b2f18266d92e5bc068667de348c0cd3b3b.
include/Utf8.h [new file with mode: 0644]
src/subtitles/STS.cpp
src/subtitles/TextFile.cpp
src/subtitles/TextFile.h
src/subtitles/subtitles_vs2010.vcxproj
src/subtitles/subtitles_vs2010.vcxproj.filters