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

diff --git a/ChangeLog b/ChangeLog
index 081563c06ec36c0b17940cb63030083e2a00a035..5bd035d0587a36273573a2d0ed12529127ff728e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-05-10  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.0.45 released.
+
 2015-05-10  Carl Hetherington  <cth@carlh.net>
 
        * Version 2.0.44 released.

diff --git a/debian/changelog b/debian/changelog
index 68c9697b1a1971afe79d124a07a67401cd6a97e9..42dc545e2bec0f8a0e406037e81b991e312bfc15 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.0.44-1) UNRELEASED; urgency=low
+dcpomatic (2.0.45-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -223,8 +223,9 @@ dcpomatic (2.0.44-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:03:37 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Sun, 10 May 2015 02:49:30 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/wscript b/wscript
index 6c48f1cfd7b55149973f1b7bd1e4b1143403462a..5edaad564496720a1b94e5c6bdc898d5c1ef93a7 100644 (file)
--- a/wscript
+++ b/wscript
@@ -25,7 +25,7 @@ import distutils.spawn
 from waflib import Logs
 
 APPNAME = 'dcpomatic'
-VERSION = '2.0.44devel'
+VERSION = '2.0.45devel'
 
 def options(opt):
     opt.load('compiler_cxx')