summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-06-05 14:28:38 +0100
committerCarl Hetherington <cth@carlh.net>2013-06-05 14:28:38 +0100
commit491390fcf0174e4e5c1e88cf872f605d5f79ce12 (patch)
treeea32e38ac3408f28f7e8798e7da5d012927a1a6f
parent3bc6c5b396bb6972ad2892237fc5d73fe8a9c42e (diff)
parentd4205f2e9c68646dcd57b010e2eb6f6cd98e2117 (diff)
Merge branch 'master' of /home/carl/git/dvdomatic
-rw-r--r--ChangeLog4
-rw-r--r--debian/changelog6
-rw-r--r--wscript2
3 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index abe6b0231..a0a9da802 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-05 Carl Hetherington <cth@carlh.net>
+
+ * Version 0.94 released.
+
2013-06-04 Carl Hetherington <cth@carlh.net>
* Version 0.94beta2 released.
diff --git a/debian/changelog b/debian/changelog
index ce981e781..c303177f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dvdomatic (0.94-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan> Wed, 05 Jun 2013 07:48:39 +0100
+
dvdomatic (0.94beta2-1) UNRELEASED; urgency=low
* New upstream release.
diff --git a/wscript b/wscript
index a4b155c63..b4cafd1fb 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
import sys
APPNAME = 'dvdomatic'
-VERSION = '0.94beta2'
+VERSION = '0.95pre'
def options(opt):
opt.load('compiler_cxx')