Merge master.
authorCarl Hetherington <cth@carlh.net>
Fri, 12 Sep 2014 22:16:31 +0000 (23:16 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 12 Sep 2014 22:16:31 +0000 (23:16 +0100)
commit3e12c68dc0451e73b5bc1a84d1d70f4999f7b4b5
treef2adf8732363450a2171d402a862a82f5ad697e9
parent6873b32db9a7275b8c49e64b63110b4cfe0980fd
parent4265db19ba68a995fca42bdd5fa815aead9c5c50
Merge master.
ChangeLog
src/lib/film.cc
src/lib/player.cc
src/lib/subtitle_content.cc
src/lib/subtitle_content.h
src/wx/subtitle_panel.cc
src/wx/subtitle_panel.h