Merge branch '1.0' of ssh://carlh.dyndns.org/home/carl/git/dvdomatic into 1.0

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 749f6360b..286a6e8aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2013-12-02  Carl Hetherington  <cth@carlh.net>
 
+	* Version 1.40 released.
+
+2013-12-02  Carl Hetherington  <cth@carlh.net>
+
 	* Fix problems with FFmpeg files that have all-zero stream IDs.
 
 	* Fix crash on checking non-existing frame info
diff --git a/debian/changelog b/debian/changelog
index 5d8ed6b1f..809f5f51c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.39-1) UNRELEASED; urgency=low
+dcpomatic (1.40-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -43,8 +43,9 @@ dcpomatic (1.39-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Sat, 30 Nov 2013 14:10:38 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Mon, 02 Dec 2013 12:35:03 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 578093329..addaafc74 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.40pre'
+VERSION = '1.41pre'
 
 def options(opt):
     opt.load('compiler_cxx')