summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-01-15 09:49:32 +0000
committerCarl Hetherington <cth@carlh.net>2014-01-15 09:49:32 +0000
commite33486234dea92b972643194e521bd64b75dab2d (patch)
tree7555d647b8cf7d3d7cdf291a7da206bca2c02316
parentb5c0e24d1c313a32f1db88a3df62c74f88f5d822 (diff)
parentd8a6b232f70883055a285c087fa8adc36e3acb8b (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 99ef9f218..138f18af6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2014-01-14 Carl Hetherington <cth@carlh.net>
+ * Version 1.63.2 released.
+
+2014-01-14 Carl Hetherington <cth@carlh.net>
+
* Fix problems with adding new soundtracks to FFmpeg content with
no audio track.
diff --git a/debian/changelog b/debian/changelog
index d8a4c8810..1aec0f649 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.63.1-1) UNRELEASED; urgency=low
+dcpomatic (1.63.2-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
@@ -73,8 +73,9 @@ dcpomatic (1.63.1-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Tue, 14 Jan 2014 11:09:45 +0000
+ -- Carl Hetherington <carl@d1stkfactory> Tue, 14 Jan 2014 22:41:33 +0000
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index d91385436..d72252459 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
import sys
APPNAME = 'dcpomatic'
-VERSION = '1.63.1devel'
+VERSION = '1.63.2devel'
def options(opt):
opt.load('compiler_cxx')