Merge branch 'video-player' of ssh://houllier/home/carl/git/dvdomatic into video-player

3 files changed, 11 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 8787a9b2d..887f8ae0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-12-20  Carl Hetherington  <cth@carlh.net>
 
+	* Version 0.68beta5 released.
+
+2012-12-20  Carl Hetherington  <cth@carlh.net>
+
 	* Version 0.68beta4 released.
 
 2012-12-20  Carl Hetherington  <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index 30b152110..8d9bef2ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dvdomatic (0.68beta5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan>  Thu, 20 Dec 2012 07:53:46 +0000
+
 dvdomatic (0.68beta4-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/wscript b/wscript
index 5b31c5890..03d516fc8 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dvdomatic'
-VERSION = '0.68beta4'
+VERSION = '0.68beta5'
 
 def options(opt):
     opt.load('compiler_cxx')