+2019-01-15 Carl Hetherington <cth@carlh.net>
+
+ * Add --encrypt/-e option to dcpomatic_create.
+
+ * Fix crash in dcpomatic2_create when using templates.
+
+2018-12-29 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.12.15 released.
+
+2018-12-19 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.12.14 released.
+
+2018-10-26 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.12.13 released.
+
+2018-10-08 Carl Hetherington <cth@carlh.net>
+
+ * Fix bad parsing of ASS lines embedded into FFmpeg files
+ and containing commas.
+
+2018-09-25 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.12.12 released.
+
+2018-06-08 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.12.11 released.
+
+2018-09-04 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.12.10 released.
+
+2018-04-27 Carl Hetherington <cth@carlh.net>
+
+ * Fix obscured subtitles in some cases.
+
+2018-04-25 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.12.9 released.
+
+2018-07-18 Carl Hetherington <cth@carlh.net>
+
+ * Add command-line option to specify directory containing config (#1284).
+
+2018-04-27 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.12.8 released.
+
+2018-06-07 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.12.7 released.
+
+2018-05-23 Carl Hetherington <cth@carlh.net>
+
+ * Fix failure to load image files with non-ASCII names.
+
+ * Version 2.12.6 released.
+
+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 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
+ re-make video (should fix #1290).
+
+2018-05-07 Carl Hetherington <cth@carlh.net>
+
+ * Fix invalid timings in SMPTE subtitle files (causing failure to play subtitles)
+ in some cases (#1293).
+
+2018-04-19 Carl Hetherington <cth@carlh.net>
+
+ * Fix crash on making a DCP after trimming the end of some text-based subtitles (#1275).
+
+2018-04-14 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.12.4 released.
+
+2018-04-13 Carl Hetherington <cth@carlh.net>
+
+ * Fix incorrect preview crop with DCP sources when the preview is smaller than half
+ of the DCP's resolution (#1274).
+
+2018-04-12 Carl Hetherington <cth@carlh.net>
+
+ * Prevent error when starting export without specifying a filename (#1260).
+
+2018-04-11 Carl Hetherington <cth@carlh.net>
+
+ * Fix 3D DCP handling in the player.
+
+2018-04-10 Carl Hetherington <cth@carlh.net>
+
+ * Fix disappearing subtitles when they are added from text files
+ alongside video content which also contain subtitles (#1271).
+
+2018-04-05 Carl Hetherington <cth@carlh.net>
+
+ * Fix crash on startup if there are no audio devices (#1265).
+
+ * Fix missing start icon for the player in Linux.
+
+ * Fix 3D DCP handling in the player.
+
+2018-04-05 Carl Hetherington <cth@carlh.net>
+
+ * Updated zh_CN translation from 刘汉源.
+
+2018-03-25 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.12.3 released.
+
+2018-03-24 Carl Hetherington <cth@carlh.net>
+
+ * Fix crash when changing DCP audio channel count (#1253).
+
+ * Fix update checker error when there is no test
+ version.
+
+ * Updated fr_FR translation from Thierry Journet.
+
+2018-03-22 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.12.2 released.
+
+2018-03-22 Carl Hetherington <cth@carlh.net>
+
+ * Updated de_DE translation from Carsten Kurz.
+
+ * Version 2.12.1 released.
+
+2018-03-22 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.12.0 released.
+
+2018-03-22 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.11.79 released.
+
+2018-03-21 Carl Hetherington <cth@carlh.net>
+
+ * Updated nl_NL translation from Rob van Nieuwkerk.
+
+2018-03-19 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.11.78 released.
+
+2018-03-16 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.11.77 released.
+
+2018-03-16 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.11.76 released.
+
+2018-03-15 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.11.75 released.
+
+2018-03-15 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.11.74 released.
+
+2018-03-13 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.11.73 released.
+
+2018-02-27 Carl Hetherington <cth@carlh.net>
+
+ * Add a hint about the stereo-to-5.1 upmixers being
+ `experimental'.
+
+2018-03-09 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.11.72 released.
+
+2018-03-09 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.11.71 released.
+
+2018-03-07 Carl Hetherington <cth@carlh.net>
+
+ * Fix bad DCPs when re-making in encrypted projects (#1232).
+
+2018-03-05 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.11.70 released.
+
+2018-03-02 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.11.69 released.
+
+2018-03-02 Carl Hetherington <cth@carlh.net>
+
+ * Fix bad Prores exports in some cases (#1227).
+
+2018-02-27 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.11.68 released.
+
+2018-02-26 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.11.67 released.
+
+2018-02-26 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.11.66 released.
+
+2018-02-25 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.11.65 released.
+
+2018-02-25 Carl Hetherington <cth@carlh.net>
+
+ * Updated es_ES translation from Manuel AC.
+
+ * Version 2.11.64 released.
+
+2018-02-25 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.11.63 released.
+
+2018-02-25 Carl Hetherington <cth@carlh.net>
+
+ * Handle errors in subtitle XML better (#1209).
+
+2018-02-24 Carl Hetherington <cth@carlh.net>
+
+ * Updated fr_FR translation from Thierry Journet.
+
+ * Version 2.11.62 released.
+
+2018-02-23 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.11.61 released.
+
+2018-02-22 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.11.60 released.
+
+2018-02-21 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.11.59 released.
+
+2018-02-18 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.11.58 released.
+
+2018-02-17 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.11.57 released.
+
+2018-02-16 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.11.56 released.
+
+2018-02-12 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.11.55 released.
+
+2018-02-10 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.11.54 released.
+
+2018-02-10 Carl Hetherington <cth@carlh.net>
+
+ * Use a different way of getting frame rate from video content; may
+ fix #1030.
+
+ * Version 2.11.53 released.
+
+2018-02-09 Carl Hetherington <cth@carlh.net>
+
+ * Always pre-roll when seeking in DCPs (#1085).
+
+ * Version 2.11.52 released.
+
+2018-02-09 Carl Hetherington <cth@carlh.net>
+
+ * Updated ru_RU translation from Igor Voytovich.
+
+2018-02-08 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.11.51 released.
+
+2018-02-08 Carl Hetherington <cth@carlh.net>
+
+ * Fix crash on adding content to a project created from a template
+ in some cases (#1192).
+
2018-02-07 Carl Hetherington <cth@carlh.net>
* Version 2.11.50 released.
* Attempt to fix random crashes on OS X (especially during encodes)
thought to be caused by multiple threads using (different) stringstreams
at the same time; see src/lib/safe_stringstream.
->>>>>>> origin/master
2014-08-09 Carl Hetherington <cth@carlh.net>