Merge branch 'master' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index d50255261..1b0832f4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2014-01-23  Carl Hetherington  <cth@carlh.net>
 
+	* Version 1.63.6 released.
+
+2014-01-23  Carl Hetherington  <cth@carlh.net>
+
 	* Fix recovery of DCP encoding after a crash with a 3D DCP.
 
 2014-01-21  Carl Hetherington  <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index 922852069..f66069e3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.63.5-1) UNRELEASED; urgency=low
+dcpomatic (1.63.6-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -77,8 +77,9 @@ dcpomatic (1.63.5-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Tue, 21 Jan 2014 22:48:10 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Thu, 23 Jan 2014 00:40:06 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 63c4f74aa..8790cf9a4 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.63.5devel'
+VERSION = '1.63.6devel'
 
 def options(opt):
     opt.load('compiler_cxx')