From: Carl Hetherington <cth@carlh.net>
Date: Sat, 21 Jun 2014 11:07:55 +0000 (+0100)
Subject: Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
X-Git-Tag: v2.0.48~551^2~83
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=e29352d14ed9d8b093323f9c2d7be1b6754cd2b2;hp=72400007e8a9c8f7e3116197943fe9f232bd90aa;p=dcpomatic.git

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

diff --git a/ChangeLog b/ChangeLog
index b088c7b4c..624923c55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-21  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.69.31 released.
+
 2014-06-20  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.69.30 released.
diff --git a/debian/changelog b/debian/changelog
index 5bdbcbb00..ce33f5681 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.69.30-1) UNRELEASED; urgency=low
+dcpomatic (1.69.31-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -154,8 +154,9 @@ dcpomatic (1.69.30-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Fri, 20 Jun 2014 11:12:54 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Sat, 21 Jun 2014 00:43:44 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index bf861df83..8babe333a 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.69.30devel'
+VERSION = '1.69.31devel'
 
 def options(opt):
     opt.load('compiler_cxx')