From: Carl Hetherington <cth@carlh.net>
Date: Fri, 1 Mar 2013 23:36:22 +0000 (+0000)
Subject: Merge.
X-Git-Tag: v2.0.48~1337^2~595^2~1
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=ab1a666e724911c41dfe08fc96748b38ace839c1;hp=--cc;p=dcpomatic.git

Merge.
---

ab1a666e724911c41dfe08fc96748b38ace839c1
diff --cc ChangeLog
index 553213938,92e0123aa..b234f5baa
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,8 +1,12 @@@
 +2013-03-01  Carl Hetherington  <cth@carlh.net>
 +
 +	* Version 0.76beta2 released.
 +
  2013-03-01  Carl Hetherington  <cth@carlh.net>
  
+ 	* Add primitive feature to plot graphs
+ 	of the soundtrack (#67).
+ 
  	* Version 0.76beta1 released.
  
  2013-02-27  Carl Hetherington  <cth@carlh.net>