Merge master.

diff --git a/ChangeLog b/ChangeLog
index 8b079d59b4b1e469b972f747b300c4b09410046f..f1a8bb76c6a8698024968bdb55f8f877df8bbe88 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-19  Carl Hetherington  <cth@carlh.net>
+       
+       * Version 0.91 released.
+
 2013-05-19  Carl Hetherington  <cth@carlh.net>
 
        * Hopefully fix load of decimal values (e.g. frame rates)

diff --git a/debian/changelog b/debian/changelog
index 6a714b2531e68d25175d20e4a1c90de74f59f329..82afdef8c207bdffbeda4156053be633e92941af 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dvdomatic (0.91-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan>  Sun, 19 May 2013 00:11:52 +0100
+
 dvdomatic (0.90-1) UNRELEASED; urgency=low
 
   * New upstream release.

diff --git a/wscript b/wscript
index 43df5d50a23bea3ff01b52ab2b910875789693aa..fd838dd1e2db2dfc92ee85f6ade1f728bce321bb 100644 (file)
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dvdomatic'
-VERSION = '0.91pre'
+VERSION = '0.92pre'
 
 def options(opt):
     opt.load('compiler_cxx')