Merge master.

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index a402353d3..29576e478 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 
 	* Fix server/client with non-RGB24 sources.
 
+	* Version 1.69.25 released.
+
+2014-06-09  Carl Hetherington  <cth@carlh.net>
+
 	* Make audio gain a floating-point value in the UI (#367).
 
 	* Work-around out-of-memory crashes with large start trims (#252).
diff --git a/debian/changelog b/debian/changelog
index 7cd4a2379..bba63b12e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.69.24-1) UNRELEASED; urgency=low
+dcpomatic (1.69.25-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -148,8 +148,9 @@ dcpomatic (1.69.24-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Mon, 09 Jun 2014 00:43:08 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Mon, 09 Jun 2014 23:59:02 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index ba48a41db..69c6df9ef 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.69.24devel'
+VERSION = '1.69.25devel'
 
 def options(opt):
     opt.load('compiler_cxx')