X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=ChangeLog;h=36a282919097ce8a2bd73f110cf54f7af97bb105;hb=22b9f3b2090d8bdfe52cda1e69d3acbe874f1ce5;hp=884f384bbb7350c600b8baea8746da750199ddba;hpb=38ec06fc927bff26ed78e45358d847ebb4e484de;p=dcpomatic.git

diff --git a/ChangeLog b/ChangeLog
index 884f384bb..36a282919 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,90 @@
+2014-08-31  Carl Hetherington  <cth@carlh.net>
+
+	* Give a hint when content and container aspect ratios are not
+	the same (#392).
+
+	* Add "copy" button to colour conversion presets editor (#399).
+
+	* Allow drag-and-drop of files onto the content list (#395).
+
+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>
+
+	* Basic recent files list in the File menu.
+
+2014-08-23  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.72.12 released.
+
+2014-08-23  Carl Hetherington  <cth@carlh.net>
+
+	* Revert previous use of AVFormatContext::start_time when
+	computing the length of video.  I think this is wrong, and
+	causes bits to be missed off the end of videos (and other
+	problems).
+
+2014-08-20  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.72.11 released.
+
+2014-08-19  Carl Hetherington  <cth@carlh.net>
+
+	* Attempt to fix random crashes on OS X (especially during encodes)
+	thought to be caused by multiple threads using (different) stringstreams
+	at the same time; see src/lib/safe_stringstream.
+>>>>>>> origin/master
+
+2014-08-09  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.72.10 released.
+
+2014-08-09  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.72.8 released.
+
+2014-08-08  Carl Hetherington  <cth@carlh.net>
+
+	* Approximate support for changing timing details of multiple
+	bits of content at the same time.
+
+	* Allow removal of multiple bits of content at the same time.
+
+	* Version 1.72.7 released.
+
 2014-08-04  Carl Hetherington  <cth@carlh.net>
 
 	* Add BCC option for KDM emails.
@@ -44,6 +131,7 @@
 2014-07-10  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.72.2 released.
+>>>>>>> origin/master
 
 2014-07-10  Carl Hetherington  <cth@carlh.net>