summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-07-08 23:38:25 +0100
committerCarl Hetherington <cth@carlh.net>2013-07-08 23:38:25 +0100
commit483008f6509dd1a2f0409335521339195cdf8f4d (patch)
tree7ca12f410c2f9a7b276d1a68cc1205e1669e54d7
parentb9b9cd71b6390052474d5812ab5b7540f16ac5a2 (diff)
parent94b593bc13271ee955d8811e6b60741369c41c66 (diff)
Merge master.
-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 cfd1ac5fd..77eaa6764 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
* Add option to pad sound so that silent channels
can be added.
+2013-07-08 Carl Hetherington <cth@carlh.net>
+
+ * Version 0.107 released.
+
2013-07-06 Carl Hetherington <cth@carlh.net>
* Various tweaks to layout, trying to make
diff --git a/debian/changelog b/debian/changelog
index a04d8adf1..235989444 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dvdomatic (0.107-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan> Mon, 08 Jul 2013 23:35:11 +0100
+
dvdomatic (0.107beta1-1) UNRELEASED; urgency=low
* New upstream release.
diff --git a/wscript b/wscript
index 45e474de1..715ea372e 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
import sys
APPNAME = 'dvdomatic'
-VERSION = '0.107beta1'
+VERSION = '0.108pre'
def options(opt):
opt.load('compiler_cxx')