summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-01-14 11:25:40 +0000
committerCarl Hetherington <cth@carlh.net>2014-01-14 11:25:40 +0000
commitcb979cc683d627da324802e2465b6187af51048e (patch)
tree6c7ce13ef58e72d6a7c2b44d43dca562892966af
parentf9290d2981cdc71f6e7092ced757a7362a93cfc2 (diff)
parent319c58577fb91998994f90b115ae80c3e1f35243 (diff)
Merge branch 'master' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic
-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 fadc8f509..4776158d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2014-01-14 Carl Hetherington <cth@carlh.net>
+ * Version 1.63.1 released.
+
+2014-01-14 Carl Hetherington <cth@carlh.net>
+
* Try to fix subtitle problems when the video frame rate is being changed
from content to DCP.
diff --git a/debian/changelog b/debian/changelog
index fe5f126f0..d8a4c8810 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.63.0-1) UNRELEASED; urgency=low
+dcpomatic (1.63.1-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
@@ -72,8 +72,9 @@ dcpomatic (1.63.0-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Mon, 13 Jan 2014 00:14:08 +0000
+ -- Carl Hetherington <carl@d1stkfactory> Tue, 14 Jan 2014 11:09:45 +0000
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index 2056305ec..d91385436 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
import sys
APPNAME = 'dcpomatic'
-VERSION = '1.63.0devel'
+VERSION = '1.63.1devel'
def options(opt):
opt.load('compiler_cxx')