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

diff --git a/ChangeLog b/ChangeLog
index 00d83bf5906a347419607beabae8f2163b709f3a..6eb3bcff0e2ddb5daad595f67bab968a52bb951b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-02  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.68.0 released.
+
 2014-04-29  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.67.1 released.

diff --git a/debian/changelog b/debian/changelog
index 23b1da6115b11c4a18366cba7c35a2145d9da547..75f830e298c212e86fe1de47a527d84ca6c2b75a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.67.1-1) UNRELEASED; urgency=low
+dcpomatic (1.68.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -122,8 +122,9 @@ dcpomatic (1.67.1-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Tue, 29 Apr 2014 18:29:53 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Fri, 02 May 2014 22:01:44 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/wscript b/wscript
index 6a4a702cbed80a667c99130c6f5998f686b0d183..829980c38373d71861505bc0a17ed4fed7103d4c 100644 (file)
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.67.1devel'
+VERSION = '1.68.0devel'
 
 def options(opt):
     opt.load('compiler_cxx')