summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-05-15 20:48:48 +0100
committerCarl Hetherington <cth@carlh.net>2018-05-21 21:35:05 +0100
commit1e1dc6d6d15a5c20d61fd084fa305162c93f47c9 (patch)
tree9105b96d6d8140e024cf3035232ecee8646062a5 /ChangeLog
parentd5ece4a49930f905b767855e4310bae74b7fdac8 (diff)
Fix up ChangeLog and cherry-pick 011d403 from master: fix missing burn-in/preview with subtitles containing ampersands.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog10
1 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2ac3da72e..a69a635c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,18 @@
-2018-05-18 Carl Hetherington <cth@carlh.net>
+2018-05-15 Carl Hetherington <cth@carlh.net>
+
+ * Fix missing burnt-in / previewed subtitles containing ampersands.
* Fix slow exports from DCP content (#1285).
2018-05-15 Carl Hetherington <cth@carlh.net>
- * Fix incorrect subtitle positining in a VF when there are more than
+ * Fix incorrect subtitle positioning in a VF when there are more than
two consecutive reels with no subtitles.
+2018-05-15 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.12.5 released.
+
2018-05-08 Carl Hetherington <cth@carlh.net>
* Look at subtitle colour and effect when deciding whether or not to