diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-10-26 23:27:01 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-10-26 23:27:01 +0100 |
| commit | a5d9f9a473d9ce8c273d9763a478e88edf2162fa (patch) | |
| tree | 1543d15eeaebda457333dbcd1e4f6da3ea6ddf18 | |
| parent | 300662c37a72f9e0bff67d515e33c21dbcf6efa1 (diff) | |
| parent | 71dfc65c45f6ee3058fd158adeab4894f5a26555 (diff) | |
Merge branch '1.0' of ssh://carlh.dyndns.org/home/carl/git/dvdomatic into 1.0
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | wscript | 2 |
3 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,7 @@ +2013-10-25 Carl Hetherington <cth@carlh.net> + + * Version 1.22 released. + 2013-10-24 Carl Hetherington <cth@carlh.net> * Support sources that require repeat of more than diff --git a/debian/changelog b/debian/changelog index 832577378..804eabdde 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.21-1) UNRELEASED; urgency=low +dcpomatic (1.22-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -25,8 +25,9 @@ dcpomatic (1.21-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington <carl@d1stkfactory> Wed, 23 Oct 2013 23:04:24 +0100 + -- Carl Hetherington <carl@d1stkfactory> Fri, 25 Oct 2013 16:12:13 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.22pre' +VERSION = '1.23pre' def options(opt): opt.load('compiler_cxx') |