Merge master.

diff --git a/ChangeLog b/ChangeLog
index cfd1ac5fd5e621260fac72ecae65825e13b9f1cc..77eaa67644cc28154f4dcc733be402280f5e9c2d 100644 (file)
--- 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 a04d8adf180a3fb9dea9dae0658ecd38cd47a59a..235989444131776bf6da688a1bd2187d3fedc980 100644 (file)
--- 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 45e474de1d1704982b7b24c0493fae73498e5270..715ea372e606037de7cd6d787217ce21a500aab0 100644 (file)
--- 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')