From: Carl Hetherington <cth@carlh.net>
Date: Tue, 28 Jan 2014 22:52:44 +0000 (+0000)
Subject: Merge.
X-Git-Tag: v2.0.48~919^2~8
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=10e4674e2a0d4d2652ad84372daa2783e4744e62;p=dcpomatic.git

Merge.
---

10e4674e2a0d4d2652ad84372daa2783e4744e62
diff --cc ChangeLog
index 2d71fc969,fee3c6876..19beeb5d9
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,11 +1,15 @@@
  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.