Merge remote-tracking branch 'refs/remotes/fieldtrip/master'

Author: sarangnemo

bin/synchronize-private.sh

@@ -2319,6 +2319,17 @@ ARRAY+=(private/ptriprojn.m)
 ARRAY+=(utilities/private/ptriprojn.m)
 sync ${ARRAY[*]}
 
+################################################################################
+# quaternion.m
+
+ARRAY=()
+ARRAY+=(fileio/private/quaternion.m)
+ARRAY+=(inverse/private/quaternion.m)
+ARRAY+=(plotting/private/quaternion.m)
+ARRAY+=(private/quaternion.m)
+ARRAY+=(utilities/private/quaternion.m)
+sync ${ARRAY[*]}
+
 ################################################################################
 # randomseed.m
 

connectivity/private/ft_progress.m

@@ -48,7 +48,7 @@ function ft_progress(varargin)
 %
 % $Id$
 
-global ft_default;
+global ft_default
 
 persistent p        % the previous value of the progress
 persistent c        % counter for the number of updates that is done
@@ -65,7 +65,7 @@ function ft_progress(varargin)
                      % but the previous invocation was not processed (due
                      % to the restriction in the number of updates to once
                      % every 100ms)
-persistent closing;
+persistent closing
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 if nargin>1 && ischar(varargin{1}) && strcmp(varargin{1}, 'init')

contrib/nutmegtrip/private/getdimord.m

@@ -176,7 +176,7 @@
     % add the trailing singleton dimensions to datsiz, if needed
     datsiz  = [datsiz ones(1,max(0,length(dimtok)-length(datsiz)))];
   end
-  if length(dimtok)==length(datsiz)
+  if length(dimtok)==length(datsiz) || (length(dimtok)==(length(datsiz)-1) && datsiz(end)==1)
     success = false(size(dimtok));
     for i=1:length(dimtok)
       sel = strcmp(tok, dimtok{i});

external/fileexchange/DataHash.license

@@ -0,0 +1,24 @@
+Copyright (c) 2016, Jan Simon
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in
+      the documentation and/or other materials provided with the distribution
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.