Merge branch '1.0' of git.carlh.net:git/dcpomatic into 2.0

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index d437647ed9e3c99a1b16d61915f215510a734d43..717fcc5280634ba4821be62013de7ee444e22b68 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-21  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.0.36 released.
+
 2015-01-21  Carl Hetherington  <cth@carlh.net>
 
        * Fix differentiation between MXF-wrapped subtitles