projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fix another cocked up merge.
[dcpomatic.git]
/
src
/
lib
/
subtitle_content.h
diff --git
a/src/lib/subtitle_content.h
b/src/lib/subtitle_content.h
index e74164f774b4cb97c671737101e64901fb1d4c63..4cbef657ab5b18da060024ee4bd13f608e53552e 100644
(file)
--- a/
src/lib/subtitle_content.h
+++ b/
src/lib/subtitle_content.h
@@
-108,8
+108,6
@@
private:
double _subtitle_x_scale;
/** y scale factor to apply to subtitles */
double _subtitle_y_scale;
-
- boost::optional<std::string> _subtitle_language;
};
#endif