From: Carl Hetherington <cth@carlh.net>
Date: Wed, 23 May 2018 11:06:49 +0000 (+0100)
Subject: Bump version
X-Git-Tag: v2.12.6^0
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=6ae538e8536a3b32d539bc5100c525a8fcc9a2f7;hp=5003c20e6c4adcc2d58a292082186c8d3b625d88;p=dcpomatic.git

Bump version
---

diff --git a/ChangeLog b/ChangeLog
index a69a635c4..b6838e3e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-05-23  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.12.6 released.
+
 2018-05-15  Carl Hetherington  <cth@carlh.net>
 
 	* Fix missing burnt-in / previewed subtitles containing ampersands.
diff --git a/debian/changelog b/debian/changelog
index 9ab4ed9c6..9ef540945 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.12.5-1) UNRELEASED; urgency=low
+dcpomatic (2.12.6-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -577,8 +577,9 @@ dcpomatic (2.12.5-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@main.carlh.net>  Tue, 15 May 2018 20:00:27 +0100
+ -- Carl Hetherington <carl@main.carlh.net>  Wed, 23 May 2018 12:06:48 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index fb1c8e5ab..0e824e0ee 100644
--- a/wscript
+++ b/wscript
@@ -27,7 +27,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.12.5devel'
+VERSION = '2.12.6'
 
 def options(opt):
     opt.load('compiler_cxx')