Merge branch 'master' into 2.0

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index d2c10fb55..ba9040cf2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2014-01-15  Carl Hetherington  <cth@carlh.net>
 
+	* Version 1.63.3 released.
+
+2014-01-15  Carl Hetherington  <cth@carlh.net>
+
 	* Hopefully fix badly-labelled MXFs when in Interop mode.
 
 2014-01-14  Carl Hetherington  <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index 1aec0f649..a9021e836 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.63.2-1) UNRELEASED; urgency=low
+dcpomatic (1.63.3-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -74,8 +74,9 @@ dcpomatic (1.63.2-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Tue, 14 Jan 2014 22:41:33 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Wed, 15 Jan 2014 09:56:52 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 772db9293..fc2d91250 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.63.2devel'
+VERSION = '1.63.3devel'
 
 def options(opt):
     opt.load('compiler_cxx')