summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--debian/changelog5
-rw-r--r--src/wx/about_dialog.cc1
-rw-r--r--wscript2
4 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d437647ed..717fcc528 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
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
and video/audio content.
diff --git a/debian/changelog b/debian/changelog
index 28d0195f7..f9dad6546 100644
--- 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 8e95c2e37..9b14a74e4 100644
--- 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 f2c408075..d24353370 100644
--- 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')