summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-11-20 22:43:53 +0000
committerCarl Hetherington <cth@carlh.net>2013-11-20 22:43:53 +0000
commit1fdf6a2afc32c9e754686a7eeb7d775ce67f6613 (patch)
tree593b1196b4d0b5ef127fef569f3a398a96990188
parent34a5f6381d7eba172dbbca25c3263180bf9c152e (diff)
parent3d19ffae49d2fbc4cbecbe62358a43afb46bc58f (diff)
Merge branch '1.0' of ssh://carlh.dyndns.org/home/carl/git/dvdomatic into 1.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 4659052fb..cd3ef0c82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2013-11-20 Carl Hetherington <cth@carlh.net>
+ * Version 1.32 released.
+
+2013-11-20 Carl Hetherington <cth@carlh.net>
+
* Version 1.31 released.
2013-11-20 Carl Hetherington <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index 11630e8aa..4810e81f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.31-1) UNRELEASED; urgency=low
+dcpomatic (1.32-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
@@ -35,8 +35,9 @@ dcpomatic (1.31-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Wed, 20 Nov 2013 16:49:09 +0000
+ -- Carl Hetherington <carl@d1stkfactory> Wed, 20 Nov 2013 18:23:35 +0000
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index 9f3741bbe..138298d25 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
import sys
APPNAME = 'dcpomatic'
-VERSION = '1.32pre'
+VERSION = '1.33pre'
def options(opt):
opt.load('compiler_cxx')