summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-10-28 12:48:26 +0000
committerCarl Hetherington <cth@carlh.net>2015-10-28 12:48:26 +0000
commitf8d4df639e7d6dba17b0cddfe131b20b5422c512 (patch)
tree3ed82bff17ee766adbc6a40ab50231710083ba10
parentb3671abbd3489381e257b1043a86551d6de3c292 (diff)
parent6478e5d4b9c54cd2102ac611c35cb83b0519db26 (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 4aaf68af9..db329a29c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2015-10-28 Carl Hetherington <cth@carlh.net>
+ * Version 2.4.13 released.
+
+2015-10-28 Carl Hetherington <cth@carlh.net>
+
* Fix ordering of filename in image sets in some cases
(e.g. foo_01042015_00000, foo_01042015_00001...)
diff --git a/debian/changelog b/debian/changelog
index 0ef0609f4..d2457ee10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.4.12-1) UNRELEASED; urgency=low
+dcpomatic (2.4.13-1) UNRELEASED; urgency=low
[ Carl Hetherington ]
* New upstream release.
@@ -334,8 +334,9 @@ dcpomatic (2.4.12-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Sat, 17 Oct 2015 16:08:37 +0100
+ -- Carl Hetherington <carl@d1stkfactory> Wed, 28 Oct 2015 11:33:01 +0000
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index ec7819d70..be3137837 100644
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
from waflib import Logs, Context
APPNAME = 'dcpomatic'
-VERSION = '2.4.12devel'
+VERSION = '2.4.13devel'
def options(opt):
opt.load('compiler_cxx')