Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic

diff --git a/ChangeLog b/ChangeLog
index 7d31d592a4e3a9c15cfb3272098bb85bd1e5c22c..1fc51803a7d4189d5a6ab9e295c8937c7b38f764 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
        LocaleGuard, hopefully to fix large numbers being written with
        thousands separators on some locales.
 
+2014-05-10  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.69.2 released.
+
 2014-05-10  Carl Hetherington  <cth@carlh.net>
 
        * Fix setup of the libswresample context to work with high channel counts.

diff --git a/debian/changelog b/debian/changelog
index 7bf686d3495584d0495aa4da5dceb181e6a190f1..418ef9fa4966fe1009e5733c90db27ea441bd7dc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.69.1-1) UNRELEASED; urgency=low
+dcpomatic (1.69.2-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -125,8 +125,9 @@ dcpomatic (1.69.1-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Fri, 09 May 2014 22:57:47 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Sat, 10 May 2014 13:40:32 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/wscript b/wscript
index 214149ef5d7888f56f970be14d0679f765f021bd..e8c19386109a25a885c8e6a54ac14cfba6a4498a 100644 (file)
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.69.1devel'
+VERSION = '1.69.2devel'
 
 def options(opt):
     opt.load('compiler_cxx')