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

diff --git a/ChangeLog b/ChangeLog
index d437647ed9e3c99a1b16d61915f215510a734d43..717fcc5280634ba4821be62013de7ee444e22b68 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-21  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.0.36 released.
+
 2015-01-21  Carl Hetherington  <cth@carlh.net>
 
        * Fix differentiation between MXF-wrapped subtitles

diff --git a/debian/changelog b/debian/changelog
index 28d0195f76e2b5b3d160980866f66f3ca76bd527..f9dad65460bf3678d6b092f16beadcd72c2e3c39 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.0.35-1) UNRELEASED; urgency=low
+dcpomatic (2.0.36-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -214,8 +214,9 @@ dcpomatic (2.0.35-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Tue, 20 Jan 2015 14:51:23 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Wed, 21 Jan 2015 19:37:44 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index 8e95c2e37cb3e0aad1da437f3704def8fa69e9cf..9b14a74e4468d13ab35dda55ad9cb3d8ac1b67b7 100644 (file)
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -135,6 +135,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
        supported_by.Add (wxT ("Evan Freeze"));
        supported_by.Add (wxT ("Silvio Giuliano"));
        supported_by.Add (wxT ("Alan Gouger"));
+       supported_by.Add (wxT ("Christopher Gray"));
        supported_by.Add (wxT ("Flor Guillaume"));
        supported_by.Add (wxT ("Patrick Haderer"));
        supported_by.Add (wxT ("Antonio Ruiz Hernandez"));

diff --git a/wscript b/wscript
index f2c408075749c12b45f5fcce4be5a4797ffaf5ab..d24353370e9988dedbcf39071be6f92c92de7738 100644 (file)
--- a/wscript
+++ b/wscript
@@ -5,7 +5,7 @@ import distutils
 import distutils.spawn
 
 APPNAME = 'dcpomatic'
-VERSION = '2.0.35devel'
+VERSION = '2.0.36devel'
 
 def options(opt):
     opt.load('compiler_cxx')