X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=ChangeLog;h=b1fcbb37ecbb2a3b06c3da8b3561835172543998;hb=f80e2f7b370c3a6dfa8a78c9665a8eaf43a05f03;hp=c1e31803c2587cae5021e5910bc6c962ac2794fa;hpb=3127fd431692d6b4715c12e1fc5eb97b56f4376a;p=dcpomatic.git

diff --git a/ChangeLog b/ChangeLog
index c1e31803c..b1fcbb37e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,53 @@
+2017-04-27  Carl Hetherington  <cth@carlh.net>
+
+	* Stop master and server instances fighting over ports, allowing them to coexist (#962).
+
+2017-04-26  Carl Hetherington  <cth@carlh.net>
+
+	* Make a copy of the configuration, if it fails to load, before making new defaults.
+
+2017-04-07  Carl Hetherington  <cth@carlh.net>
+
+	* Make jump-to-content-start on selection in the content list
+	optional.
+
+2017-04-03  Carl Hetherington  <cth@carlh.net>
+
+	* Confirm overwrite of existing DCPs when making a new one.
+
+2017-03-07  Carl Hetherington  <cth@carlh.net>
+
+	* Handle failure to write to cinemas file more nicely.
+
+2017-03-03  Carl Hetherington  <cth@carlh.net>
+
+	* Add option to write KDMs to separate folders
+	or ZIP files.
+
+2017-02-28  Carl Hetherington  <cth@carlh.net>
+
+	* Updated de_DE translation from Carsten Kurz.
+
+2017-02-27  Carl Hetherington  <cth@carlh.net>
+
+	* Updated zh_CN translation from 刘汉源.
+
+2017-02-20  Carl Hetherington  <cth@carlh.net>
+
+	* Add "Add DCP" button to the content panel.
+
+2017-02-18  Carl Hetherington  <cth@carlh.net>
+
+	* Updated fr_FR translation from Thierry Journet.
+
+2017-02-15  Carl Hetherington  <cth@carlh.net>
+
+	* Updated nl_NL translation from Rob van Nieuwkerk.
+
+2017-02-14  Carl Hetherington  <cth@carlh.net>
+
+	* Updated de_DE translation from Carsten Kurz.
+
 2017-02-13  Carl Hetherington  <cth@carlh.net>
 
 	* Version 2.10.9 released.