X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=ChangeLog;h=5201319d624e63739c4d9d7ae0b837f3bd06b01a;hp=d126e0fb50a53fbad381c77f474bf4130dbf676a;hb=ed0b3ee0c5a0ba11d3a1a1dfee8e71238bcab4bd;hpb=83cc718cc4f38bc2a9cc8cd62ed570415c5ba289

diff --git a/ChangeLog b/ChangeLog
index d126e0fb5..5201319d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,66 @@
-2018-03-23  Carl Hetherington  <cth@carlh.net>
+2018-04-13  Carl Hetherington  <cth@carlh.net>
+
+	* 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).
@@ -4052,7 +4114,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>