From: Carl Hetherington <cth@carlh.net>
Date: Thu, 7 Jan 2016 00:53:46 +0000 (+0000)
Subject: Bump version
X-Git-Tag: v2.6.12
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=987dd207d96c49812b0eac281904c79d7da46edd;p=dcpomatic.git

Bump version
---

diff --git a/ChangeLog b/ChangeLog
index 9c9dc9842..5dd493a46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-07  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.6.12 released.
+
 2016-01-06  Carl Hetherington  <cth@carlh.net>
 
 	* Updated ru_RU translation from Igor Voytovich.
diff --git a/debian/changelog b/debian/changelog
index 36465e85b..670064b6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.6.11-1) UNRELEASED; urgency=low
+dcpomatic (2.6.12-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -368,8 +368,9 @@ dcpomatic (2.6.11-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Wed, 06 Jan 2016 11:07:10 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Thu, 07 Jan 2016 00:53:45 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index a2eacdfa1..c57754290 100644
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.6.11devel'
+VERSION = '2.6.12'
 
 def options(opt):
     opt.load('compiler_cxx')