X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=ChangeLog;h=c34750ad6595a5e25ea72c042e903a728c8bb5f5;hb=7b2054e2a73844450b5b55c5788c02af671812ce;hp=40797c7b37f328cd376e2bad87e16009b98a7724;hpb=a8c46e9791b6bf2f5aa0fa1a8640bf0991b88cf1;p=dcpomatic.git

diff --git a/ChangeLog b/ChangeLog
index 40797c7b3..c34750ad6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,95 @@
+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.
+
+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.
+
+2014-07-29  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.72.5 released.
+
+2014-07-17  Carl Hetherington  <cth@carlh.net>
+
+	* Fix corrupted text in job descriptions in some cases.
+
+	* Speculative fix for failure to keep Windows
+	machines awake during encodes.
+
 2014-07-16  Carl Hetherington  <cth@carlh.net>
 
+	* Version 1.72.4 released.
+
+2014-07-16  Carl Hetherington  <cth@carlh.net>
+
+	* Add default scaling setting to preferences (#384).
+
 	* Version 1.72.3 released.
 
 2014-07-16  Carl Hetherington  <cth@carlh.net>
@@ -23,6 +113,7 @@
 2014-07-10  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.72.2 released.
+>>>>>>> origin/master
 
 2014-07-10  Carl Hetherington  <cth@carlh.net>