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

diff --git a/ChangeLog b/ChangeLog
index 9d42431b845cd90e61473101ee585622e3aeb34d..6f5bbb0ffa89d022e3ba258d2b325aa0cd398323 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 
        * Fix non-update of audio gain when changing selected content.
 
+2014-09-14  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.73.6 released.
+
 2014-09-14  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.73.5 released.

diff --git a/debian/changelog b/debian/changelog
index 0584ec5c2b38f97dab3430c21329973192a25f0d..07f0510ee742490d4f2dc035a7f5532916e0c6fe 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.73.5-1) UNRELEASED; urgency=low
+dcpomatic (1.73.6-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -181,8 +181,9 @@ dcpomatic (1.73.5-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Sun, 14 Sep 2014 10:56:13 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Sun, 14 Sep 2014 21:50:07 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/wscript b/wscript
index d1ce36e3c3b245d8eba5072cbc7b2018a44c0e9e..801fe05479b552210a189fb26f58a7714877e841 100644 (file)
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.73.5devel'
+VERSION = '1.73.6devel'
 
 def options(opt):
     opt.load('compiler_cxx')