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

diff --git a/ChangeLog b/ChangeLog
index 1988607a5e5a333025b414fd66f5722ecdace5c0..7c414cec24620f35268c1aa8eba8bc7ae5ef09e0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
        * Sort image files added using "Add file(s)..." alphabetically
        rather than trying to find numbers in the filenames.
 
+2016-01-07  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.6.13 released.
+
 2016-01-07  Carl Hetherington  <cth@carlh.net>
 
        * Version 2.6.12 released.

diff --git a/debian/changelog b/debian/changelog
index 670064b6bd2fd754c8b8f28b1cd3867b30e6061d..4a0a797d5528dd1f0be1e9fc36f4cbc1dbfaa6af 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.6.12-1) UNRELEASED; urgency=low
+dcpomatic (2.6.13-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -369,8 +369,9 @@ dcpomatic (2.6.12-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Thu, 07 Jan 2016 00:53:45 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Thu, 07 Jan 2016 14:32:42 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/wscript b/wscript
index 1717374def3c2fd190eafc8993a3ea6fb740cec5..e0d759bac64d012133e609b579000c006b90f347 100644 (file)
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.6.12devel'
+VERSION = '2.6.13devel'
 
 def options(opt):
     opt.load('compiler_cxx')