summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-06-03 23:37:12 +0100
committerCarl Hetherington <cth@carlh.net>2014-06-03 23:37:12 +0100
commitfa35da1ebea58be1449f79c3f057265b7501c3b6 (patch)
tree718b6290ec649ec6a67de70f21afc8d8d5c98249
parent82926443230084739cb673a83b2ab1f9d733a07b (diff)
Bump version
-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 a0e776b0e..83fcc8960 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2014-06-03 Carl Hetherington <cth@carlh.net>
+ * Version 1.69.21 released.
+
+2014-06-03 Carl Hetherington <cth@carlh.net>
+
* Fix bad resampling of separate sound file sources that
have specified video frame rates.
diff --git a/debian/changelog b/debian/changelog
index 4b144629d..c0750ff6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.69.20-1) UNRELEASED; urgency=low
+dcpomatic (1.69.21-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
@@ -144,8 +144,9 @@ dcpomatic (1.69.20-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Tue, 03 Jun 2014 15:32:33 +0100
+ -- Carl Hetherington <carl@d1stkfactory> Tue, 03 Jun 2014 23:37:12 +0100
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index 2684793a4..5721c6e0c 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
import sys
APPNAME = 'dcpomatic'
-VERSION = '1.69.20devel'
+VERSION = '1.69.21'
def options(opt):
opt.load('compiler_cxx')