v6.1.3 staging commit

ucdavis · Feb 17, 2017 · d1655d3 · d1655d3
1 parent 3f4d6b4
commit d1655d3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/GUIs/geterpvaluesGUI2.fig b/GUIs/geterpvaluesGUI2.fig
diff --git a/GUIs/geterpvaluesGUI2.m b/GUIs/geterpvaluesGUI2.m
@@ -2629,10 +2629,8 @@ function text_fa1_CreateFcn(hObject, eventdata, handles)
 % eventdata  reserved - to be defined in a future version of MATLAB
 % handles    empty - handles not created until after all CreateFcns called
 
-
 % --- Executes during object creation, after setting all properties.
 function text_fraca_CreateFcn(hObject, eventdata, handles)
-% hObject    handle to text_fraca (see GCBO)
+% hObject    handle to text_fa1 (see GCBO)
 % eventdata  reserved - to be defined in a future version of MATLAB
 % handles    empty - handles not created until after all CreateFcns called
-set(handles.text_fraca,'String', {''})
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 
 ERPLAB Toolbox is a free, open-source Matlab package for analyzing ERP data.  It is tightly integrated with [EEGLAB Toolbox](http://sccn.ucsd.edu/eeglab/), extending EEGLAB’s capabilities to provide robust, industrial-strength tools for ERP processing, visualization, and analysis.  A graphical user interface makes it easy for beginners to learn, and Matlab scripting provides enormous power for intermediate and advanced users.
 
-## ERPLAB v6.1.2
+## ERPLAB v6.1.3
 
 <p align="center" >
   <a href="https://github.com/lucklab/erplab/releases/download/6.1.2/erplab6.1.2.zip"><img src="https://cloud.githubusercontent.com/assets/8988119/8532773/873b2af0-23e5-11e5-9869-c900726713a2.jpg">
@@ -11,7 +11,7 @@ ERPLAB Toolbox is a free, open-source Matlab package for analyzing ERP data.  It
  </a>
 </p>
 
-To install ERPLAB v6.1.2, download the zip file (linked above), unzip and place the folder in the 'plugins' folder of your existing EEGLAB installation (e.g.  `~/Documents/MATLAB/eeglab13_6_4b/plugins/erplab6.1.2/`). [Additional installation help can be found here](https://github.com/lucklab/erplab/wiki/Installation).
+To install ERPLAB v6.1.3, download the zip file (linked above), unzip and place the folder in the 'plugins' folder of your existing [EEGLAB](https://sccn.ucsd.edu/eeglab/download.php) installation (e.g.  `~/Documents/MATLAB/eeglab13_6_4b/plugins/erplab6.1.3/`). [Additional installation help can be found here](https://github.com/lucklab/erplab/wiki/Installation).
 
 To run ERPLAB, ensure that the correct EEGLAB folder is in your current Matlab path, and run **eeglab** as a command from the Matlab Command Window. [Find our tutorial here.](http://erpinfo.org/erplab/erplab-documentation).
 
@@ -50,6 +50,11 @@ Here is a list of some confirmed-working environments for ERPLAB.
 
 ## <br/>
 
+# ERPLAB v6.1.3 Patch
+Minor bugfixes, including:
+- Cleaned up the Measurement Viewer text and options
+- Measurement Viewer helper text now only shown when relevant
+
 # ERPLAB v6.1.2 Patch
 Minor bugfixes, including:
 - Fixed BDF Library url-link in BDF-Visualizer

diff --git a/erplab_default_values.m b/erplab_default_values.m
@@ -1,5 +1,5 @@
-erplabver = '6.1.2';                  % current erplab version
-erplabrel = '30-Jan-2017';             % DOB
+erplabver = '6.1.3';                  % current erplab version
+erplabrel = '16-Feb-2017';             % DOB
 %ColorB = [170 180 195]/255;          % old background color (until version 3)
 %ColorB = [0.9216 0.8353 0.6078];     % background color for version 4
 %ColorB = [0.7020 0.7647 0.8392];     % background color since version 4.0.0.3