Merge.

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 2d71fc969..19beeb5d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 
 	* 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.
diff --git a/debian/changelog b/debian/changelog
index f66069e3d..447f201f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.63.6-1) UNRELEASED; urgency=low
+dcpomatic (1.63.7-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -78,8 +78,9 @@ dcpomatic (1.63.6-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Thu, 23 Jan 2014 00:40:06 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Tue, 28 Jan 2014 15:56:45 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 8790cf9a4..63fecdd59 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.63.6devel'
+VERSION = '1.63.7devel'
 
 def options(opt):
     opt.load('compiler_cxx')