Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0

diff --git a/ChangeLog b/ChangeLog
index 17ffca9660d65de381f1faaa5824cfd68188d12a..f205716b2c559c4a5add59187b6917ea3fb52a29 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-15  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.0.34 released.
+
 2015-01-15  Carl Hetherington  <cth@carlh.net>
 
        * Version 2.0.33 released.

diff --git a/TO_PORT b/TO_PORT
index 6a269a37dea63ccb0a8497dfe648b5847cbbd1c2..13354d9b7d4d58eb9d02fcd230fba6cf2a41ed85 100644 (file)
--- a/TO_PORT
+++ b/TO_PORT
@@ -1 +1,3 @@
 b6f64a51f2ac819e2aac50bede1c5ce94e4d4fa3
+1fe5559f0b6ad51e0c3380bc9919e941f3c94a85
+0e86c9ee06ab902e4a59ca7e866d7df5bfa29cc5

diff --git a/debian/changelog b/debian/changelog
index a0f55e2d12c33a6a572584d8db5606097f935534..a69ecce23dde28151aab2c318bff9e458e3a4c10 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.0.33-1) UNRELEASED; urgency=low
+dcpomatic (2.0.34-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -212,8 +212,9 @@ dcpomatic (2.0.33-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Thu, 15 Jan 2015 11:36:01 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Thu, 15 Jan 2015 16:49:22 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/wscript b/wscript
index 06059fb411738ea2458e7ea9bca3f226066a2e21..9f686f14e5ef715d1eb24fe6a3393f9644384a66 100644 (file)
--- a/wscript
+++ b/wscript
@@ -5,7 +5,7 @@ import distutils
 import distutils.spawn
 
 APPNAME = 'dcpomatic'
-VERSION = '2.0.33devel'
+VERSION = '2.0.34devel'
 
 def options(opt):
     opt.load('compiler_cxx')