From: Carl Hetherington <cth@carlh.net>
Date: Tue, 6 May 2014 23:11:04 +0000 (+0100)
Subject: Merge master.
X-Git-Tag: v2.0.48~823
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=1dcfb3a26085ebb3703f40e2f51e43ce3d98be50

Merge master.
---

1dcfb3a26085ebb3703f40e2f51e43ce3d98be50
diff --cc ChangeLog
index 38a8ea5ce,729a335de..b7e9ad74f
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,11 +1,15 @@@
 +2014-03-07  Carl Hetherington  <cth@carlh.net>
 +
 +	* Add subtitle view.
 +
+ 2014-05-05  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Version 1.69.0 released.
+ 
+ 2014-05-02  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Version 1.68.0 released.
+ 
  2014-04-29  Carl Hetherington  <cth@carlh.net>
  
  	* Version 1.67.1 released.