Merge master.
authorCarl Hetherington <cth@carlh.net>
Wed, 18 Jul 2018 22:13:48 +0000 (23:13 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 19 Jul 2018 22:36:56 +0000 (23:36 +0100)
commit65cc06076b46cbd27ccfcf7387894358e2c8ab1e
tree72eed4030fa0cf08190723410467645a1f199dd1
parent491edba4e79656a045103a284c65b846a167d2ff
Merge master.
src/lib/dcp_text_decoder.cc
test/dcp_subtitle_test.cc
test/subtitle_charset_test.cc