Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index fb7890ec653d25363344f987681a6d93167302d5..6803804ca56ed568e93f7cab46eeb8b690562285 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2017-01-04  Carl Hetherington  <cth@carlh.net>
+
+       * Fix non frame-aligned trims when using the to-playhead
+       buttons.
+
+2016-12-25  Carl Hetherington  <cth@carlh.net>
+
+       * Updated fr_FR translation from Thierry Journet.
+
 2016-12-21  Carl Hetherington  <cth@carlh.net>
 
        * Add approximate finish time to progress on jobs (#927).