summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-02-25 08:00:31 +0000
committerCarl Hetherington <cth@carlh.net>2013-02-25 08:00:31 +0000
commitab624eaed4423b1813148e1c395092697b541139 (patch)
tree8206034260c74ce08696a0a4b087e3fad3edc936
parent1ae970dfd86a8c314660379fcbc9c7995778e5b5 (diff)
parentacaa6e95d2833b7d186aac5f2a2179c75188a52a (diff)
Merge branch 'master' into plot-audio
-rw-r--r--ChangeLog8
-rw-r--r--debian/changelog12
-rw-r--r--wscript2
3 files changed, 21 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8facb96c0..ba250996f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-02-23 Carl Hetherington <cth@carlh.net>
+
+ * Version 0.74 released.
+
+2013-02-23 Carl Hetherington <cth@carlh.net>
+
+ * Version 0.74beta1 released.
+
2013-02-21 Carl Hetherington <cth@carlh.net>
* Version 0.73 released.
diff --git a/debian/changelog b/debian/changelog
index 9aaab999d..a21623f6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+dvdomatic (0.74-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan> Sat, 23 Feb 2013 22:57:20 +0000
+
+dvdomatic (0.74beta1-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan> Sat, 23 Feb 2013 21:44:22 +0000
+
dvdomatic (0.73-1) UNRELEASED; urgency=low
* New upstream release.
diff --git a/wscript b/wscript
index e2706cf9d..93ffe2240 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
import sys
APPNAME = 'dvdomatic'
-VERSION = '0.74pre'
+VERSION = '0.75pre'
def options(opt):
opt.load('compiler_cxx')