summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-01-30 13:08:39 +0000
committerCarl Hetherington <cth@carlh.net>2018-01-30 13:08:39 +0000
commit2faac3648f2fd4f3983878e1fd0569a944a5f55e (patch)
tree906d6092a4b2a88493b51e8ee1bed8f3815b1401
parent35841948169c44863f9fb39cdee4dccf0463846a (diff)
parent90f198821fe604eeb9b9e16e04f13b0821e07f4a (diff)
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
-rw-r--r--ChangeLog4
-rw-r--r--debian/changelog5
-rw-r--r--wscript2
3 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a3b517b5c..1a354eacd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-01-30 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.11.45 released.
+
2018-01-18 Carl Hetherington <cth@carlh.net>
* Version 2.11.44 released.
diff --git a/debian/changelog b/debian/changelog
index 83d19ca8c..cf12bdb3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.11.44-1) UNRELEASED; urgency=low
+dcpomatic (2.11.45-1) UNRELEASED; urgency=low
[ Carl Hetherington ]
* New upstream release.
@@ -536,8 +536,9 @@ dcpomatic (2.11.44-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@main.carlh.net> Thu, 18 Jan 2018 22:10:18 +0000
+ -- Carl Hetherington <carl@main.carlh.net> Tue, 30 Jan 2018 00:53:51 +0000
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index 215b5bb91..c80449229 100644
--- a/wscript
+++ b/wscript
@@ -27,7 +27,7 @@ import distutils.spawn
from waflib import Logs, Context
APPNAME = 'dcpomatic'
-VERSION = '2.11.44devel'
+VERSION = '2.11.45devel'
def options(opt):
opt.load('compiler_cxx')