summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-06-29 23:46:44 +0100
committerCarl Hetherington <cth@carlh.net>2015-06-29 23:46:44 +0100
commit1daeeb6b5bd9966b605f6dc8894a191365b20f61 (patch)
tree9391637b4cec555a0525359b09274b6cf03139df
parent318a778b1b5c98b79b202dc953ff2ac131371a1b (diff)
Bump versionv2.1.12
-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 c0b3d0583..bcbcd9b13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-06-29 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.1.12 released.
+
2015-06-25 c.hetherington <cth@carlh.net>
* Disallow impossible burn settings by manipulating
diff --git a/debian/changelog b/debian/changelog
index 7bdab3429..d5b66a9fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.1.11-1) UNRELEASED; urgency=low
+dcpomatic (2.1.12-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
@@ -242,8 +242,9 @@ dcpomatic (2.1.11-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Fri, 26 Jun 2015 22:17:40 +0100
+ -- Carl Hetherington <carl@d1stkfactory> Mon, 29 Jun 2015 23:46:44 +0100
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index d10f7782e..e7ccb88d1 100644
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
from waflib import Logs
APPNAME = 'dcpomatic'
-VERSION = '2.1.11devel'
+VERSION = '2.1.12'
def options(opt):
opt.load('compiler_cxx')