summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 cd1ef9750..5692c86fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2015-12-02 Carl Hetherington <cth@carlh.net>
+ * Version 2.6.0 released.
+
+2015-12-02 Carl Hetherington <cth@carlh.net>
+
* Version 2.5.15 released.
2015-12-02 Carl Hetherington <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index 3384b1723..29660a4cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.5.15-1) UNRELEASED; urgency=low
+dcpomatic (2.6.0-1) UNRELEASED; urgency=low
[ Carl Hetherington ]
* New upstream release.
@@ -356,8 +356,9 @@ dcpomatic (2.5.15-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Wed, 02 Dec 2015 21:05:48 +0000
+ -- Carl Hetherington <carl@d1stkfactory> Wed, 02 Dec 2015 22:15:47 +0000
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index 64232659c..1c1a1f047 100644
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
from waflib import Logs, Context
APPNAME = 'dcpomatic'
-VERSION = '2.5.15devel'
+VERSION = '2.6.0'
def options(opt):
opt.load('compiler_cxx')