Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 5bd035d05..851189199 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2015-05-10  Carl Hetherington  <cth@carlh.net>
 
+	* Version 2.0.46 released.
+
+2015-05-10  Carl Hetherington  <cth@carlh.net>
+
 	* Version 2.0.45 released.
 
 2015-05-10  Carl Hetherington  <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index 42dc545e2..7850ebcc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.0.45-1) UNRELEASED; urgency=low
+dcpomatic (2.0.46-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -224,8 +224,9 @@ dcpomatic (2.0.45-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Sun, 10 May 2015 02:49:30 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Sun, 10 May 2015 03:23:45 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 5edaad564..1ba0db01c 100644
--- a/wscript
+++ b/wscript
@@ -25,7 +25,7 @@ import distutils.spawn
 from waflib import Logs
 
 APPNAME = 'dcpomatic'
-VERSION = '2.0.45devel'
+VERSION = '2.0.46devel'
 
 def options(opt):
     opt.load('compiler_cxx')