X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=ChangeLog;h=4a6285ba05cd8357cbba77c9f01b390a05b29301;hb=31f9d8691ec467c7b7d977f1950dfbfa98ba73ac;hp=99a577390259002ff2e78dc1e121ed77db1efcf7;hpb=ccde188f3b560730d14933af5caa11b413c2e623;p=dcpomatic.git

diff --git a/ChangeLog b/ChangeLog
index 99a577390..4a6285ba0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,100 @@
-2018-03-14  Carl Hetherington  <cth@carlh.net>
+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.
 
@@ -4006,7 +4102,6 @@
 	* 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>