Fix merge.

3 files changed, 13 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 706bf51df..b92d63637 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-12-13  Carl Hetherington  <cth@carlh.net>
 
+	* Version 0.63 released.
+
+2012-12-13  Carl Hetherington  <cth@carlh.net>
+
 	* Re-fix reports of zero audio channels
 	with soundtracks of some source files.
 
diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
index 88c03d753..993c41563 100644
--- a/src/tools/dvdomatic.cc
+++ b/src/tools/dvdomatic.cc
@@ -361,11 +361,19 @@ public:
 	}
 };
 
+#if wxMINOR_VERSION == 9
+static const wxCmdLineEntryDesc command_line_description[] = {
+	{ wxCMD_LINE_OPTION, "l", "log", "set log level (silent, verbose or timing)", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
+        { wxCMD_LINE_PARAM, 0, 0, "film to load", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_PARAM_OPTIONAL },
+	{ wxCMD_LINE_NONE }
+};
+#else
 static const wxCmdLineEntryDesc command_line_description[] = {
 	{ wxCMD_LINE_OPTION, wxT("l"), wxT("log"), wxT("set log level (silent, verbose or timing)"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
         { wxCMD_LINE_PARAM, 0, 0, wxT("film to load"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_PARAM_OPTIONAL },
 	{ wxCMD_LINE_NONE }
 };
+#endif
 
 class App : public wxApp
 {
diff --git a/wscript b/wscript
index d64f922f3..ca3ef2737 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dvdomatic'
-VERSION = '0.63pre'
+VERSION = '0.64pre'
 
 def options(opt):
     opt.load('compiler_cxx')