Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index ccbbadc49ad52584f9a954c670d01e6f9cbce492..2f9fd4fb17d2ce28a36a12dde052617b3af40420 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-07-08  c.hetherington  <cth@carlh.net>
+
+       * Remove the (I suspect) rarely used and very limited
+       'properties' dialogue.
+
+       * Stop V2 recognising V1 servers and vice versa (#510).
+
 2015-07-07  Carl Hetherington  <cth@carlh.net>
 
        * Version 2.1.19 released.