summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-03-26 00:13:09 +0000
committerCarl Hetherington <cth@carlh.net>2013-03-26 00:13:09 +0000
commit0d64c6dfd3bf8f59946795f8b97c5351b2619fa2 (patch)
tree7577198b1dc33c411a4521bffe4ab53b10d8d609
parente14edb562b6b7516ee3a2805d2669662da4da8bc (diff)
parent8a04a7c6626c7b668695799072c862b5b0f961de (diff)
Merge.
-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 44d8d512d..30179a5ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
* Add option to set user interface language.
+2013-03-25 Carl Hetherington <cth@carlh.net>
+
+ * Version 0.78beta6 released.
+
2013-03-24 Carl Hetherington <cth@carlh.net>
* Add UI option to select interface language.
diff --git a/debian/changelog b/debian/changelog
index f5037d78d..372b53124 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dvdomatic (0.78beta6-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan> Mon, 25 Mar 2013 00:08:10 +0000
+
dvdomatic (0.78beta5-1) UNRELEASED; urgency=low
* New upstream release.
diff --git a/wscript b/wscript
index 1a507fbc2..3532b81de 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
import sys
APPNAME = 'dvdomatic'
-VERSION = '0.78beta5'
+VERSION = '0.78beta6'
def options(opt):
opt.load('compiler_cxx')