From: Carl Hetherington <cth@carlh.net>
Date: Fri, 26 Apr 2013 22:49:54 +0000 (+0100)
Subject: Merge master.
X-Git-Tag: v2.0.48~1337^2~347^2~20
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=87a709a4ea5dffaadaf35ef94edb4b578eb3b56c

Merge master.
---

87a709a4ea5dffaadaf35ef94edb4b578eb3b56c
diff --cc ChangeLog
index 8cabafd0b,c5df3d2cc..129d148e9
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,11 +1,17 @@@
 +2013-04-24  Carl Hetherington  <cth@carlh.net>
 +
 +	* Allow use of existing empty directories for new films (without
 +	confirmation) and existing non-empty directories (with confirmation)
 +	(#124).
 +
+ 2013-04-26  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Version 0.87 released.
+ 
+ 2013-04-26  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Make new trim options actually work (#121).
+ 
  2013-04-23  Carl Hetherington  <cth@carlh.net>
  
  	* Version 0.86 released.