Hand-apply 3e3d3e46a74af7b3e6431033c7c80bd058c02cf6update; full/play

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 0e5d600fad95a11987e13eca48ce087b2ffb83b2..86d8c071cc939a5e1d6f0e9331135c77c6396991 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2015-03-25  Carl Hetherington  <cth@carlh.net>
+
+       * Hand-apply 3e3d3e46a74af7b3e6431033c7c80bd058c02cf6update;
+       full/play length in the timing panel when the DCP frame rate is
+       changed.
+
+2015-03-24  Carl Hetherington  <cth@carlh.net>
+
+       * Hand-apply 31eafa8a121b8d341d198e4fe426ee843cc70167; add a note
+       to the timing panel to try to stop people changing the video frame
+       rate in the wrong circumstances.
+
+       * Hand-apply e30fd8d; resurrect JSON server code.
+
+       * Hand-apply 7ba9dcdbfe8f0d94ad9887843995c152c45dfe9e from master;
+       allow "deletion" of the audio part of a FFmpeg file from the
+       timeline; delete unmaps the audio (#316).
+
+2015-02-25  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.0.41 released.
+
 2015-02-10  c.hetherington  <cth@carlh.net>
 
        * Default to no colour conversion for