summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-01-15 10:27:10 +0000
committerCarl Hetherington <cth@carlh.net>2015-01-15 10:27:10 +0000
commitefa498c9150f0d2f987a087357fe7e25d385d214 (patch)
tree393f5c8d298a87e5e3d41b4876e395b7298e975c
parentcf480e869ca654e771f9f88d766ad72c20d38712 (diff)
parent1b645ef543ba671724f98bd759966dc2d01400ea (diff)
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
-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 355b3e271..ef32e1806 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2015-01-15 Carl Hetherington <cth@carlh.net>
+ * Version 2.0.32 released.
+
+2015-01-15 Carl Hetherington <cth@carlh.net>
+
* Version 2.0.31 released.
2015-01-15 Carl Hetherington <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index 8a6436dc2..b7103c275 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.0.31-1) UNRELEASED; urgency=low
+dcpomatic (2.0.32-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
@@ -210,8 +210,9 @@ dcpomatic (2.0.31-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Thu, 15 Jan 2015 09:41:09 +0000
+ -- Carl Hetherington <carl@d1stkfactory> Thu, 15 Jan 2015 10:11:28 +0000
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index 054b55091..5a8da54fe 100644
--- a/wscript
+++ b/wscript
@@ -5,7 +5,7 @@ import distutils
import distutils.spawn
APPNAME = 'dcpomatic'
-VERSION = '2.0.31devel'
+VERSION = '2.0.32devel'
def options(opt):
opt.load('compiler_cxx')