summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-10-10 17:10:00 +0100
committerCarl Hetherington <cth@carlh.net>2015-10-10 17:10:00 +0100
commit6b8473e9f933e63644a7d07c65d83e863e576954 (patch)
tree736ce4c4a800de8f68ec5916a67673ed0344f32b
parentd915fd0a238cc1bb9a0cb8824ac4cc81a1d1eab8 (diff)
parent1eb0598b57f80bc3d6a3a0b9d8f465f10d76e0f9 (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 a887a90c6..5d90b75ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2015-10-10 Carl Hetherington <cth@carlh.net>
+ * Version 2.4.7 released.
+
+2015-10-10 Carl Hetherington <cth@carlh.net>
+
* Updated nl_NL translation from
Rob van Nieuwkerk.
diff --git a/debian/changelog b/debian/changelog
index 99471090a..e195b31fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.4.6-1) UNRELEASED; urgency=low
+dcpomatic (2.4.7-1) UNRELEASED; urgency=low
[ Carl Hetherington ]
* New upstream release.
@@ -328,8 +328,9 @@ dcpomatic (2.4.6-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Fri, 09 Oct 2015 17:18:35 +0100
+ -- Carl Hetherington <carl@d1stkfactory> Sat, 10 Oct 2015 14:26:16 +0100
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index 867b0385e..98c31d08e 100644
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
from waflib import Logs, Context
APPNAME = 'dcpomatic'
-VERSION = '2.4.6devel'
+VERSION = '2.4.7devel'
def options(opt):
opt.load('compiler_cxx')