summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-06-20 08:40:18 +0100
committerCarl Hetherington <cth@carlh.net>2013-06-20 08:40:18 +0100
commita63bb70636ed16fd380a478c4320b77ffc0e25b6 (patch)
tree4fe73a18cd22a6e3b558d705d329478f6eb5e497
parent04466dcbbc2bc202ddd219b2cf26e47e50def274 (diff)
parent6c71e7e25536b7fee526a9c7216dcee9230b7e91 (diff)
Merge branch 'master' of /home/carl/git/dvdomatic
-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 64455b5d9..d2f48d0cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2013-06-19 Carl Hetherington <cth@carlh.net>
+ * Version 0.101 released.
+
+2013-06-19 Carl Hetherington <cth@carlh.net>
+
* Version 0.101beta5 released.
2013-06-19 Carl Hetherington <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index bb6398425..ba2825a7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dvdomatic (0.101-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan> Wed, 19 Jun 2013 18:55:41 +0100
+
dvdomatic (0.101beta5-1) UNRELEASED; urgency=low
* New upstream release.
diff --git a/wscript b/wscript
index 088918cac..d99ce876e 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
import sys
APPNAME = 'dvdomatic'
-VERSION = '0.101beta5'
+VERSION = '0.102pre'
def options(opt):
opt.load('compiler_cxx')