# HG changeset patch # User Christopher Hummersone # Date 1494933334 -3600 # Node ID c7d11a428a0d890a715d63e1b97c3aa0d9d58c64 # Parent 01e89332e23efed0b63ad972cd40bb1db1be03ef# Parent 8f36d7072f2f257048f93c20f9e3f3b246c038d0 Merge branch 'develop' * develop: Updated copyright year. diff -r 01e89332e23e -r c7d11a428a0d help_html/source/help_Example.m --- a/help_html/source/help_Example.m Tue May 16 11:57:36 2017 +0100 +++ b/help_html/source/help_Example.m Tue May 16 12:15:34 2017 +0100 @@ -95,6 +95,6 @@ % % %

% diff -r 01e89332e23e -r c7d11a428a0d help_html/source/help_Index.m --- a/help_html/source/help_Index.m Tue May 16 11:57:36 2017 +0100 +++ b/help_html/source/help_Index.m Tue May 16 12:15:34 2017 +0100 @@ -62,6 +62,6 @@ % % %

% diff -r 01e89332e23e -r c7d11a428a0d help_html/source/help_MASSEF.m --- a/help_html/source/help_MASSEF.m Tue May 16 11:57:36 2017 +0100 +++ b/help_html/source/help_MASSEF.m Tue May 16 12:15:34 2017 +0100 @@ -119,6 +119,6 @@ % % %

% diff -r 01e89332e23e -r c7d11a428a0d help_html/source/help_MASSEF_doc.m --- a/help_html/source/help_MASSEF_doc.m Tue May 16 11:57:36 2017 +0100 +++ b/help_html/source/help_MASSEF_doc.m Tue May 16 12:15:34 2017 +0100 @@ -9,6 +9,6 @@ % % %

% diff -r 01e89332e23e -r c7d11a428a0d help_html/source/help_MASSEF_evaluate.m --- a/help_html/source/help_MASSEF_evaluate.m Tue May 16 11:57:36 2017 +0100 +++ b/help_html/source/help_MASSEF_evaluate.m Tue May 16 12:15:34 2017 +0100 @@ -42,6 +42,6 @@ % % %

% diff -r 01e89332e23e -r c7d11a428a0d help_html/source/help_MASSEF_install.m --- a/help_html/source/help_MASSEF_install.m Tue May 16 11:57:36 2017 +0100 +++ b/help_html/source/help_MASSEF_install.m Tue May 16 12:15:34 2017 +0100 @@ -19,6 +19,6 @@ % % %

% diff -r 01e89332e23e -r c7d11a428a0d help_html/source/help_MASSEF_save.m --- a/help_html/source/help_MASSEF_save.m Tue May 16 11:57:36 2017 +0100 +++ b/help_html/source/help_MASSEF_save.m Tue May 16 12:15:34 2017 +0100 @@ -12,6 +12,6 @@ % % %

% diff -r 01e89332e23e -r c7d11a428a0d help_html/source/help_MASSEF_start.m --- a/help_html/source/help_MASSEF_start.m Tue May 16 11:57:36 2017 +0100 +++ b/help_html/source/help_MASSEF_start.m Tue May 16 12:15:34 2017 +0100 @@ -14,6 +14,6 @@ % % %

% diff -r 01e89332e23e -r c7d11a428a0d help_html/source/help_MASSEFresults.m --- a/help_html/source/help_MASSEFresults.m Tue May 16 11:57:36 2017 +0100 +++ b/help_html/source/help_MASSEFresults.m Tue May 16 12:15:34 2017 +0100 @@ -89,6 +89,6 @@ % % %

% diff -r 01e89332e23e -r c7d11a428a0d help_html/source/help_MASSEFresults_algorithmInfo.m --- a/help_html/source/help_MASSEFresults_algorithmInfo.m Tue May 16 11:57:36 2017 +0100 +++ b/help_html/source/help_MASSEFresults_algorithmInfo.m Tue May 16 12:15:34 2017 +0100 @@ -15,6 +15,6 @@ % % %

% diff -r 01e89332e23e -r c7d11a428a0d help_html/source/help_MASSEFresults_filter.m --- a/help_html/source/help_MASSEFresults_filter.m Tue May 16 11:57:36 2017 +0100 +++ b/help_html/source/help_MASSEFresults_filter.m Tue May 16 12:15:34 2017 +0100 @@ -35,6 +35,6 @@ % % %

% diff -r 01e89332e23e -r c7d11a428a0d help_html/source/help_MASSEFresults_input.m --- a/help_html/source/help_MASSEFresults_input.m Tue May 16 11:57:36 2017 +0100 +++ b/help_html/source/help_MASSEFresults_input.m Tue May 16 12:15:34 2017 +0100 @@ -12,6 +12,6 @@ % % %

% diff -r 01e89332e23e -r c7d11a428a0d help_html/source/help_MASSEFresults_merge.m --- a/help_html/source/help_MASSEFresults_merge.m Tue May 16 11:57:36 2017 +0100 +++ b/help_html/source/help_MASSEFresults_merge.m Tue May 16 12:15:34 2017 +0100 @@ -11,6 +11,6 @@ % % %

% diff -r 01e89332e23e -r c7d11a428a0d help_html/source/help_MASSEFresults_mixtureInfo.m --- a/help_html/source/help_MASSEFresults_mixtureInfo.m Tue May 16 11:57:36 2017 +0100 +++ b/help_html/source/help_MASSEFresults_mixtureInfo.m Tue May 16 12:15:34 2017 +0100 @@ -22,6 +22,6 @@ % % %

% diff -r 01e89332e23e -r c7d11a428a0d help_html/source/help_Separators.m --- a/help_html/source/help_Separators.m Tue May 16 11:57:36 2017 +0100 +++ b/help_html/source/help_Separators.m Tue May 16 12:15:34 2017 +0100 @@ -56,6 +56,6 @@ % % %