From: Carl Hetherington <cth@carlh.net>
Date: Tue, 16 Sep 2014 20:16:33 +0000 (+0100)
Subject: Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
X-Git-Tag: v2.0.48~561^2~11
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=99178eea5f3d326ece871ec82da1d7ca9e2dbcaf;hp=138dbf31b4f4d711113f91d597c4f312b756d59b;p=dcpomatic.git

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

diff --git a/ChangeLog b/ChangeLog
index 9d42431b8..6f5bbb0ff 100644
--- 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 0584ec5c2..07f0510ee 100644
--- 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 d1ce36e3c..801fe0547 100644
--- 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')