X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=ChangeLog;h=91263bed6d62d26dad20640d50a744ee1efd8e37;hb=1943a2a4e04bc803f15a595f6faacf53cbab224f;hp=5d4a67ae7fcdd8a85ab5877420158851c7b53511;hpb=9a5f1ef94b9916f5cd5996255007200bf61af7bf;p=dcpomatic.git

diff --git a/ChangeLog b/ChangeLog
index 5d4a67ae7..91263bed6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2018-02-07  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.11.50 released.
+
+2018-02-06  Carl Hetherington  <cth@carlh.net>
+
+	* Fix problems with text subtitle files containing OS X line-endings.
+
+	* Version 2.11.49 released.
+
+2018-02-05  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.11.48 released.
+
+2018-02-04  Carl Hetherington  <cth@carlh.net>
+
+	* Allow main DCP-o-matic and batch converter to run on the same
+	machine and both get access to encoding servers (#1190).
+
 2018-02-03  Carl Hetherington  <cth@carlh.net>
 
 	* Updated de_DE translation from Carsten Kurz.