X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=ChangeLog;h=3a67b0aa73e7d88946b38bc9aa61b8087f3b14fc;hb=b6e388dc3ea1ab37711f50bbc28a93f48de98db3;hp=6b617c06e65b478b090e310f4e590875c7245817;hpb=90077c9c139830ba299332f129ce940b1319139a;p=dcpomatic.git

diff --git a/ChangeLog b/ChangeLog
index 6b617c06e..3a67b0aa7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,52 @@
+2015-03-25  Carl Hetherington  <cth@carlh.net>
+
+	* Hand-apply ec3e6abf817b84d589f0782b01f5059dd3bf0953; only allow
+	even DCP audio channel counts between 2 and 16 inclusive.
+
+	* 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
+	JPEG2000 and DCP content (#445).
+
+2015-02-06  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.40 released.
+
+2015-02-06  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.39 released.
+
+2015-01-31  Carl Hetherington  <cth@carlh.net>
+
+	* Fix error when using audio delay.
+
+2015-01-30  Carl Hetherington  <cth@carlh.net>
+
+	* Fix update of preview when video fade changes.
+
+	* Hopefully fix black borders round the preview in
+	some cases.
+
 2015-01-24  Carl Hetherington  <cth@carlh.net>
 
 	* Version 2.0.38 released.