From: Carl Hetherington <cth@carlh.net>
Date: Sat, 30 Aug 2014 12:22:41 +0000 (+0100)
Subject: Merge master.
X-Git-Tag: v2.0.48~632
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=2d24bc7aaed800415bce4fffe06f261d5e9e464a

Merge master.
---

2d24bc7aaed800415bce4fffe06f261d5e9e464a
diff --cc ChangeLog
index d3891e82c,a966e7532..b584a6c7c
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,32 -1,10 +1,37 @@@
  2014-08-29  Carl Hetherington  <cth@carlh.net>
  
 +	* Version 2.0.4 released.
 +
 +2014-08-24  Carl Hetherington  <cth@carlh.net>
 +
 +	* Version 2.0.3 released.
 +
 +2014-08-24  Carl Hetherington  <cth@carlh.net>
 +
 +	* Version 2.0.2 released.
 +
 +2014-08-06  Carl Hetherington  <cth@carlh.net>
 +
 +	* Version 2.0.1 released.
 +
 +2014-07-15  Carl Hetherington  <cth@carlh.net>
 +
 +	* A variety of changes were made on the 2.0 branch
 +	but not documented in the ChangeLog.  Most sigificantly:
 +
 +	- DCP import
 +	- Creation of DCPs with proper XML subtitles
 +	- Import of .srt and .xml subtitles
 +	- Audio processing framework (with some basic processors).
 +
 +2014-03-07  Carl Hetherington  <cth@carlh.net>
 +
 +	* Add subtitle view.
+ 	* Some improvements to the manual.
+ 
+ 2014-08-26  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Version 1.73.0 released.
  
  2014-08-25  Carl Hetherington  <cth@carlh.net>
  
diff --cc debian/changelog
index 99cdc4f58,7002c19cf..a671a9e8d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,4 +1,8 @@@
++<<<<<<< HEAD
 +dcpomatic (2.0.4-1) UNRELEASED; urgency=low
++=======
+ dcpomatic (1.73.0-1) UNRELEASED; urgency=low
++>>>>>>> origin/master
  
    * New upstream release.
    * New upstream release.