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;hp=736f9d8154080ea5837b31af623ef863eea1a7c5

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

diff --git a/ChangeLog b/ChangeLog
index 3b631c2af..6803804ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@
 
 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>