From: Carl Hetherington <cth@carlh.net>
Date: Tue, 26 Mar 2013 00:59:26 +0000 (+0000)
Subject: Merge.
X-Git-Tag: v2.0.48~1337^2~524
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=1262fa53826afb4c6916e2961d4e82bdb6ead9cd

Merge.
---

1262fa53826afb4c6916e2961d4e82bdb6ead9cd
diff --cc ChangeLog
index 0e4f2d1b4,543e38b76..03af7d2b7
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,11 @@@
+ 2013-03-26  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Add button to cancel jobs.
+ 
 +2013-03-26  Carl Hetherington  <cth@carlh.net>
 +
 +	* Version 0.78beta7 released.
 +
  2013-03-25  Carl Hetherington  <cth@carlh.net>
  
  	* Add option to set user interface language.