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

diff --git a/ChangeLog b/ChangeLog
index 5fa89b7719b3d870bcdd71c2e6849a903504124e..376f58a8522304a340987a5bfd19d70121d3524f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-01  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.3.12 released.
+
 2015-09-30  c.hetherington  <cth@carlh.net>
 
        * Fix broken video frame rate override control.

diff --git a/debian/changelog b/debian/changelog
index 8ee279b450337f6ea615974f7dd4d936ac8a7888..1122eae0227c1c327aa93918073af6c5628d9c44 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.3.11-1) UNRELEASED; urgency=low
+dcpomatic (2.3.12-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -318,8 +318,9 @@ dcpomatic (2.3.11-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Wed, 30 Sep 2015 09:19:32 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Thu, 01 Oct 2015 09:57:27 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/wscript b/wscript
index 93a5d1e91d0d1ad4a579a5dcaf927b541081c81b..ebe5c409597351e833263bff61ce4140cda94c4b 100644 (file)
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs
 
 APPNAME = 'dcpomatic'
-VERSION = '2.3.11devel'
+VERSION = '2.3.12devel'
 
 def options(opt):
     opt.load('compiler_cxx')