From: Carl Hetherington <cth@carlh.net>
Date: Thu, 5 Jan 2017 09:37:57 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
X-Git-Tag: v2.10.6-fix~7
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=c8be0644833dce6ff39202430bba0ab358f3e096

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

c8be0644833dce6ff39202430bba0ab358f3e096
diff --cc ChangeLog
index fb7890ec6,3b631c2af..6803804ca
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,14 +1,16 @@@
+ 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).
 +
  	* Version 2.10.5 released.
  
  2016-12-21  Carl Hetherington  <cth@carlh.net>