summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-01-07 15:17:31 +0000
committerCarl Hetherington <cth@carlh.net>2016-01-07 15:17:31 +0000
commit52b9a5f3edb119c19ce49c6885a7f3733d11f2e8 (patch)
tree02be420e7d4691c3b401b58037ab67e3f3be36d1
parentf9482e2896031942784f870306e705d070ceac9d (diff)
parent89384629fa7020b11f0bf68cbf19f69de244a040 (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 1988607a5..7c414cec2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
2016-01-07 Carl Hetherington <cth@carlh.net>
+ * Version 2.6.13 released.
+
+2016-01-07 Carl Hetherington <cth@carlh.net>
+
* Version 2.6.12 released.
2016-01-06 Carl Hetherington <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index 670064b6b..4a0a797d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.6.12-1) UNRELEASED; urgency=low
+dcpomatic (2.6.13-1) UNRELEASED; urgency=low
[ Carl Hetherington ]
* New upstream release.
@@ -369,8 +369,9 @@ dcpomatic (2.6.12-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Thu, 07 Jan 2016 00:53:45 +0000
+ -- Carl Hetherington <carl@d1stkfactory> Thu, 07 Jan 2016 14:32:42 +0000
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index 1717374de..e0d759bac 100644
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
from waflib import Logs, Context
APPNAME = 'dcpomatic'
-VERSION = '2.6.12devel'
+VERSION = '2.6.13devel'
def options(opt):
opt.load('compiler_cxx')