summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-10-09 09:15:59 +0100
committerCarl Hetherington <cth@carlh.net>2013-10-09 09:15:59 +0100
commit63e4b86f622fc613bbdbdedc6f39146066b79688 (patch)
tree6584bf34997d726d34019823e198999501569cc5
parent826d533ee8d4a6505d27010f6327fcb44023b28c (diff)
parenta01a43c4d3b3933d7cb4f6be62fc942c8fac15ff (diff)
Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0
-rw-r--r--ChangeLog4
-rw-r--r--debian/changelog5
-rw-r--r--wscript2
3 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2fb4906a1..caa04e3b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-08 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.07 released.
+
2013-10-01 Carl Hetherington <cth@carlh.net>
* Version 1.06 released.
diff --git a/debian/changelog b/debian/changelog
index e204ee9b7..5f74ead67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.06-1) UNRELEASED; urgency=low
+dcpomatic (1.07-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
@@ -10,8 +10,9 @@ dcpomatic (1.06-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Tue, 01 Oct 2013 16:30:21 +0100
+ -- Carl Hetherington <carl@d1stkfactory> Tue, 08 Oct 2013 18:59:58 +0100
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index cd08261f3..55d08fe56 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
import sys
APPNAME = 'dcpomatic'
-VERSION = '1.07pre'
+VERSION = '1.08pre'
def options(opt):
opt.load('compiler_cxx')