Merge.
authorCarl Hetherington <cth@carlh.net>
Thu, 11 Dec 2014 16:47:48 +0000 (16:47 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 11 Dec 2014 16:47:48 +0000 (16:47 +0000)
commit5d117c316fe68686885a931bf028cbd8afa5c0e1
tree90b2e60eb06137b35d9683b349ece51a765e6f3b
parentfe47588e80b35c07fc25b1d9e79bc13b6e439ff0
parent6bd8be029c72180a41d70e590bf2cb85a77317bf
Merge.
src/lib/subtitle_content.cc
src/lib/subtitle_content.h