+2018-04-29 Carl Hetherington <cth@carlh.net>
+
+ * Add command-line option to specify directory containing config (#1284).
+
+2018-04-27 Carl Hetherington <cth@carlh.net>
+
+ * Fix incorrect container size when loading a OV/VF combination into the player.
+
+ * Fix obscured subtitles in some cases.
+
+2018-04-25 Carl Hetherington <cth@carlh.net>
+
+ * Updated fr_FR translation from Thierry Journet.
+
+ * Updated de_DE translation from Carsten Kurz.
+
+2018-04-22 Carl Hetherington <cth@carlh.net>
+
+ * Add missing MOS makrer in ISDCF names if there is no sound.
+
+2018-04-21 Carl Hetherington <cth@carlh.net>
+
+ * Updated nl_NL translation from Rob van Nieuwkerk.
+
+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-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).
+
+ * Update encoding server list when one goes away (#1176).
+
+ * Add servers with bad server-link versions in the list (#982).
+
+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-06 Carl Hetherington <cth@carlh.net>
+
+ * Fix missing start icon for the player in Linux.
+
+2018-04-05 Carl Hetherington <cth@carlh.net>
+
+ * Updated zh_CN translation from 刘汉源.
+
+ * Fix crash on startup if there are no audio devices (#1265).
+
+ * Fix non-working arrow keys / space in text fields (#1263).
+
+ * Fix assertion failures with 3D content in some cases.
+
+2018-03-28 Carl Hetherington <cth@carlh.net>
+
+ * Disable audio mapping control when analysing audio (#1250).
+
+2018-03-27 Carl Hetherington <cth@carlh.net>
+
+ * Use a label rather than a tooltip to tell users why they can't
+ refer to DCPs.
+
+2018-03-26 Carl Hetherington <cth@carlh.net>
+
+ * Add real-time mouse cursor readout in audio analysis (rest of #1082)
+
+ * Add time axis to audio analysis (part of #1082).
+
+ * Note: from this point in the ChangeLog release versions
+ are marked using git tags and not written to the ChangeLog.
+
+2018-03-25 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.13.2 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>
+
+ * Add space shortcut to start/stop playback, arrows to go
+ back/forward one frame and Ctrl-T to open timeline (#1201).
+
+2018-03-22 Carl Hetherington <cth@carlh.net>
+
+ * Allow CPL selection in player (#1239).
+
+ * Add hint about making a DCP with a very different frame rate
+ to the content.
+
+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.
+
+ * 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>
+
+ * Better error when loading a non-certificate as a certificate.
+
+ * Very basic DCP verification option in the player.
+
+2018-03-07 Carl Hetherington <cth@carlh.net>
+
+ * Fix bad DCPs when re-making in encrypted projects (#1232).
+
+2018-03-02 Carl Hetherington <cth@carlh.net>
+
+ * Fix bad Prores exports in some cases (#1227).
+
+2018-02-27 Carl Hetherington <cth@carlh.net>
+
+ * Add a hint about the stereo-to-5.1 upmixers being
+ `experimental'.
+
+2018-02-25 Carl Hetherington <cth@carlh.net>
+
+ * Updated es_ES translation from Manuel AC.
+
+ * Handle errors in subtitle XML better (#1209).
+
+2018-02-24 Carl Hetherington <cth@carlh.net>
+
+ * Updated fr_FR translation from Thierry Journet.
+
+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>