summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-07-04 22:42:26 +0100
committerCarl Hetherington <cth@carlh.net>2013-07-04 22:42:26 +0100
commitff5dcaaeff14f4eb8d7cabe7a7af2cf66fa39512 (patch)
treeba7b5a4c7ed306a3a4903d71cafff1d1b7276aba
parent6d7b419d42aa8a5df91836dee3c4b3b7a8849bf8 (diff)
parentdb7ee6fc9293617d3f08f97b3415bfdaf5705a02 (diff)
Merge branch 'master' of ssh://houllier/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 1d8f3fb42..7bb54b4c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2013-07-04 Carl Hetherington <cth@carlh.net>
+ * Version 0.107beta1 released.
+
+2013-07-04 Carl Hetherington <cth@carlh.net>
+
* Try to initialise the number of threads to the number
of cores in the machine (#170).
diff --git a/debian/changelog b/debian/changelog
index 7a88d3de7..a04d8adf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dvdomatic (0.107beta1-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan> Thu, 04 Jul 2013 00:28:04 +0100
+
dvdomatic (0.106-1) UNRELEASED; urgency=low
* New upstream release.
diff --git a/wscript b/wscript
index 0008d198f..45e474de1 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
import sys
APPNAME = 'dvdomatic'
-VERSION = '0.107pre'
+VERSION = '0.107beta1'
def options(opt):
opt.load('compiler_cxx')