diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-10-20 16:08:59 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-10-20 16:08:59 +0100 |
| commit | bea0786a2de854964248778526bb084cc21e04a8 (patch) | |
| tree | 437371fe02f1325644cf4262c06f087c8ba82176 | |
| parent | 57b87d4260231643ad1a5aa1000d99b1d62f0a56 (diff) | |
| parent | 1a5faeeaac6638e00720fa81a539cb3fa79b844b (diff) | |
Merge.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | wscript | 2 |
3 files changed, 8 insertions, 3 deletions
@@ -2,6 +2,10 @@ * Allow specification of subtitle language even if DVD-o-matic isn't providing the subtitles. + +2013-10-20 Carl Hetherington <cth@carlh.net> + + * Version 1.18 released. 2013-10-19 Carl Hetherington <cth@carlh.net> diff --git a/debian/changelog b/debian/changelog index 318c1cf54..4059e2dd1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.17-1) UNRELEASED; urgency=low +dcpomatic (1.18-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -21,8 +21,9 @@ dcpomatic (1.17-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington <carl@d1stkfactory> Wed, 16 Oct 2013 23:10:34 +0100 + -- Carl Hetherington <carl@d1stkfactory> Sun, 20 Oct 2013 00:39:22 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.18pre' +VERSION = '1.19pre' def options(opt): opt.load('compiler_cxx') |