diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-02 12:47:17 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-02 12:47:17 +0100 |
| commit | 938f413bb4ebecd51c805027e331cb7eb0ca9502 (patch) | |
| tree | 27fa1618657055b7421d4987b25987b48958b764 /src/subtitle_asset.cc | |
| parent | c2bac22380bea453665a24c6f39200a977771daf (diff) | |
| parent | f51e1ec6f5cacd05196ce7625709c18f6b38f63e (diff) | |
Merge master; at least partially.
Diffstat (limited to 'src/subtitle_asset.cc')
| -rw-r--r-- | src/subtitle_asset.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/subtitle_asset.cc b/src/subtitle_asset.cc index 80cc1ea6..7f4d47d0 100644 --- a/src/subtitle_asset.cc +++ b/src/subtitle_asset.cc @@ -22,6 +22,7 @@ #include <boost/algorithm/string.hpp> #include <libxml++/nodes/element.h> #include "subtitle_asset.h" +#include "parse/subtitle.h" #include "util.h" #include "xml.h" |