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

diff --git a/ChangeLog b/ChangeLog
index 524b97e0b..5201319d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+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 刘汉源.
@@ -4093,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>