summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-12-03 10:09:17 +0000
committerCarl Hetherington <cth@carlh.net>2015-12-03 10:09:17 +0000
commit9f8116a47be15ab3ca54d005c2ea06fd666f553b (patch)
tree844c4f471fc3e5b3b44900c5a1e321daa8ffbd26
parent1d93a1663bb79677fcbd5603f94095f9ddbeea16 (diff)
Bump versionv2.6.1
-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 6546f8f29..65b443e4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2015-12-03 Carl Hetherington <cth@carlh.net>
+ * Version 2.6.1 released.
+
+2015-12-03 Carl Hetherington <cth@carlh.net>
+
* Fix crash on uploading to TMS via FTP.
2015-12-02 Carl Hetherington <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index 29660a4cc..452b245eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.6.0-1) UNRELEASED; urgency=low
+dcpomatic (2.6.1-1) UNRELEASED; urgency=low
[ Carl Hetherington ]
* New upstream release.
@@ -357,8 +357,9 @@ dcpomatic (2.6.0-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Wed, 02 Dec 2015 22:15:47 +0000
+ -- Carl Hetherington <carl@d1stkfactory> Thu, 03 Dec 2015 10:09:16 +0000
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index c8e85e8cd..6129dcf85 100644
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
from waflib import Logs, Context
APPNAME = 'dcpomatic'
-VERSION = '2.6.0devel'
+VERSION = '2.6.1'
def options(opt):
opt.load('compiler_cxx')