From: Carl Hetherington <cth@carlh.net>
Date: Sun, 22 Jun 2014 20:48:49 +0000 (+0100)
Subject: Merge master.
X-Git-Tag: v2.0.48~778
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=e6c67f4aac2ca9afc275b6f13058e1e46f2cecc3

Merge master.
---

e6c67f4aac2ca9afc275b6f13058e1e46f2cecc3
diff --cc ChangeLog
index c2439f807,cd348ca76..2782b563e
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,11 @@@
 +2014-03-07  Carl Hetherington  <cth@carlh.net>
 +
 +	* Add subtitle view.
 +
+ 2014-06-22  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Fix large memory leak with image sources.
+ 
  2014-06-21  Carl Hetherington  <cth@carlh.net>
  
  	* Move email config into the KDM email page.