Merge.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 1b0832f4b9083bec9e0fc81b99290b29a8741f2d..19beeb5d9d667bef0905743cbfa08968cff46d16 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2014-01-28  Carl Hetherington  <cth@carlh.net>
+
+       * Use Mbit/s instead of the incorrect MBps.
+
+       * Version 1.63.7 released.
+
+2014-01-28  Carl Hetherington  <cth@carlh.net>
+
+       * Try to prevent Windows machines going to sleep during encodes.
+
+       * Add option to not install main program / server on Windows.
+
+2014-01-26  Carl Hetherington  <cth@carlh.net>
+
+       * Change default JPEG2000 bandwith to 100MBps.
+
+       * Updated fr_FR translation from Theirry Journet.
+
+2014-01-24  Carl Hetherington  <cth@carlh.net>
+
+       * Try to fix repeatedly-reported exceptions.
+
 2014-01-23  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.63.6 released.