diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-10-12 16:59:02 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-10-12 16:59:02 +0100 |
| commit | 94f8542edaf36c2fa43bc2ebbc0932dc58f495db (patch) | |
| tree | 5e8b2def284b18c456c04ece7004d13c026dc9d5 | |
| parent | 7e4cb563de0a65f8926462363018d617e4fe8628 (diff) | |
| parent | f7661f46fa44addf5f7d4bac36d409dc437992fe (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,5 +1,9 @@ 2013-10-12 Carl Hetherington <cth@carlh.net> + * Version 1.13 released. + +2013-10-12 Carl Hetherington <cth@carlh.net> + * Fix linux static build. 2013-10-11 Carl Hetherington <cth@carlh.net> diff --git a/debian/changelog b/debian/changelog index bab1ed310..5e5fdb468 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.12-1) UNRELEASED; urgency=low +dcpomatic (1.13-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -16,8 +16,9 @@ dcpomatic (1.12-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington <carl@d1stkfactory> Fri, 11 Oct 2013 19:31:53 +0100 + -- Carl Hetherington <carl@d1stkfactory> Sat, 12 Oct 2013 13:36:59 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.13pre' +VERSION = '1.14pre' def options(opt): opt.load('compiler_cxx') |