2017-07-25 Brad Kennedy <bk@co60.ca>

    * CHANGELOG: Change changelog format to actually contain changes
    ensure you follow the format and put newer changes above this one

    * vised_marks: Updated version for performance and compatibility

    * batch_context: Updated version for performance, logging, reporting

CHANGELOG

+2017-07-25  Brad Kennedy  <bk@co60.ca>
+
+    * CHANGELOG: Change changelog format to actually contain changes
+    ensure you follow the format and put newer changes above this one
+
+    * vised_marks: Updated version for performance and compatibility
+
+    * batch_context: Updated version for performance, logging, reporting
\ No newline at end of file

README.md

+# eeg_pipe_asr_amica
+
+This project contains submodules and tweeks to eeglab that we use in the [eeg_pipe_asr_amica pipeline project](https://git.sharcnet.ca/bucanl_pipelines/eeg_pipe_asr_amica).
+
+# Documentation
+All documentation is stored on [the Wiki](https://git.sharcnet.ca/bucanl_pipelines/eeg_pipe_asr_amica/wikis/home)
+
+## Install
+You may find install/download instructions [here](https://git.sharcnet.ca/bucanl_pipelines/eeg_pipe_asr_amica/wikis/install-download)
+
+## Contribution Guide
+[The Contribution Guide](https://git.sharcnet.ca/bucanl_pipelines/eeg_pipe_asr_amica/wikis/contributing)
+
+## Contact / Issues
+Feel free to make an issue in the [Issue Tracker](https://git.sharcnet.ca/bucanl_pipelines/eeg_pipe_asr_amica/issues)
+or [contact us directly](https://git.sharcnet.ca/bucanl_pipelines/eeg_pipe_asr_amica/wikis/contributing#contacting-us)
+
+## License / Copyright
+
+Copyright (C) 2017 James Desjardins and others
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+You should have received a copy of the GNU General Public License along with this program (LICENSE.txt file in the root directory); if not, write to the Free Software Foundation, Inc., 59 Temple Place,
\ No newline at end of file

eeglab.m

@@ -2076,7 +2076,7 @@ function buildhelpmenu;
     
 % parse plugin function name
 % --------------------------
-function [name, vers] = parsepluginname(dirName);
+function [name, vers] = parsepluginname(dirName)
     ind = find( dirName >= '0' & dirName <= '9' );
     if isempty(ind)
         name = dirName;

batch_context @ 35d9fa4a

-Subproject commit 41138f537fcaed14907d1eae3b52fe0051ba358c
+Subproject commit 35d9fa4a86c7f3884dfb5ecf4df2d2262dbf2e6a

plugins/browse_merge/VERSION

+v1.0.0
\ No newline at end of file

plugins/browse_merge/eegplugin_browsemerge.m

 % eegplugin_Import() - Import menu.
-function eegplugin_browsemerge(fig,try_strings,catch_strings)
-
+function version = eegplugin_browsemerge(fig,try_strings,catch_strings)
+version = get_version('browsemerge', 'browsemerge1.0.0');
 
 %--------------------------------------------------------------------------
 % Get File menu handle...
@@ -16,3 +16,23 @@ finalcmdBM=[cmd];
 %-------------------------------------
 uimenu(filemenu,'label','merge files from browser','callback',finalcmdBM,'separator','on');
 
+end
+function version = get_version(prefix, fallback)
+    version = fallback;
+    [curdir, ~, ~] = fileparts(which(mfilename()));
+    versionpath = fullfile(curdir, 'VERSION');
+    if ~exist(versionpath, 'file')
+        return;
+    end
+    fid = fopen(versionpath);
+    if fid == -1
+        return;
+    end
+    text = deblank(fread(fid, '*char')');
+    fclose(fid);
+    if text(1) == 'v'
+        version = [prefix text(2:end)];
+    else
+        version = [prefix text];
+    end
+end
\ No newline at end of file

interp_mont @ 30e351e7

-Subproject commit c6435b7c50ac4e4496cc95b360375170b9f355ab
+Subproject commit 30e351e7bcdf28c111ca2e11e70c0bad5ff2beac

vised_marks @ 9fa5bf2f

-Subproject commit 86735fac29f7ddffcac7d6ed7f6eb4d3ef5226be
+Subproject commit 9fa5bf2fd9c5d0e730d29c9b1b3198b9d4382713