summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-06-21 21:56:49 +0100
committerCarl Hetherington <cth@carlh.net>2014-06-21 21:56:49 +0100
commit2586f0b3b527ab298149b456d3ae52e60ce8b6a0 (patch)
treee59b48e40f53b10d86d55aa953426877e0f858d4
parent5ae11069596fb01d3a1fd01ffd0db8d100dee7f4 (diff)
parentb5523c032fb79bd808d43afd289b23ef643e68f0 (diff)
Merge branch 'master' of ssh://main.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 fc70460d2..3cc95f69a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2014-06-21 Carl Hetherington <cth@carlh.net>
+ * Version 1.69.33 released.
+
+2014-06-21 Carl Hetherington <cth@carlh.net>
+
* Version 1.69.32 released.
2014-06-21 Carl Hetherington <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index fdf912c83..3a10749c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.69.32-1) UNRELEASED; urgency=low
+dcpomatic (1.69.33-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
@@ -156,8 +156,9 @@ dcpomatic (1.69.32-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Sat, 21 Jun 2014 14:59:59 +0100
+ -- Carl Hetherington <carl@d1stkfactory> Sat, 21 Jun 2014 19:09:14 +0100
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index 0f780b082..d35d03758 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
import sys
APPNAME = 'dcpomatic'
-VERSION = '1.69.32devel'
+VERSION = '1.69.33devel'
def options(opt):
opt.load('compiler_cxx')