Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0

diff --git a/ChangeLog b/ChangeLog
index 4b5241d7ae6c29a5032b941ad0478dd8583aca00..980bfba88561e77a83335562cddb0955619f9a09 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-09-10  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.0.8 released.
+
 2014-09-10  Carl Hetherington  <cth@carlh.net>
 
        * Fix loading of 1.x films.

diff --git a/debian/changelog b/debian/changelog
index f8c7f3b40325a941010fa0b90632d3684cb0f24a..cb8c44575928b2a9476bcde61282e28fdbf289cf 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.0.7-1) UNRELEASED; urgency=low
+dcpomatic (2.0.8-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -177,8 +177,9 @@ dcpomatic (2.0.7-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Tue, 09 Sep 2014 22:46:29 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Wed, 10 Sep 2014 09:45:31 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/wscript b/wscript
index d717c5ef0931a78dedbbbc92cedeb63ed1d43e27..786b578231e1676fca450da7de80ec07855bb9f1 100644 (file)
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '2.0.7devel'
+VERSION = '2.0.8devel'
 
 def options(opt):
     opt.load('compiler_cxx')