Skip to content

Commit

Permalink
* moved file2mat and mat2fil to @file_array/private (updated make ins…
Browse files Browse the repository at this point in the history
…tall accordingly)

* SVN properties

SVN r1530
gllmflndn committed Apr 30, 2008
1 parent 6079bd6 commit cbd4938
Showing 20 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion file2mat.m → @file_array/private/file2mat.m
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
% Copyright (C) 2008 Wellcome Trust Centre for Neuroimaging

% John Ashburner
% $Id: file2mat.m 1143 2008-02-07 19:33:33Z spm $
% $Id: file2mat.m 1530 2008-04-30 19:28:22Z guillaume $

%-This is merely the help file for the compiled routine
error('file2mat.c not compiled - see Makefile');
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion mat2file.m → @file_array/private/mat2file.m
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ function mat2file(a,val,varargin)
% Copyright (C) 2008 Wellcome Trust Centre for Neuroimaging

% John Ashburner
% $Id: mat2file.m 1143 2008-02-07 19:33:33Z spm $
% $Id: mat2file.m 1530 2008-04-30 19:28:22Z guillaume $

%-This is merely the help file for the compiled routine
error('mat2file.c not compiled - see Makefile');
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 2 additions & 4 deletions spm_get_defaults.m
Original file line number Diff line number Diff line change
@@ -16,9 +16,7 @@
% Copyright (C) 2008 Wellcome Trust Centre for Neuroimaging

% Volkmar Glauche
% $Id: spm_realign.m 1265 2008-03-28 11:45:04Z john $

rev = '$Rev:$';
% $Id: spm_get_defaults.m 1530 2008-04-30 19:28:22Z guillaume $

global defaults;

@@ -30,4 +28,4 @@
varargout{1} = subsref(defaults, subs);
else
defaults = subsasgn(defaults, subs, varargin{1});
end;
end
5 changes: 3 additions & 2 deletions src/Makefile
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
#
# Copyright (C) 2008 Wellcome Trust Centre for Neuroimaging
#
# $Id: Makefile 1297 2008-04-02 18:08:48Z guillaume $
# $Id: Makefile 1530 2008-04-30 19:28:22Z guillaume $
#
###############################################################################
#
@@ -49,7 +49,7 @@ SPMMEX =\
spm_unlink.$(SUF) spm_hist.$(SUF)\
spm_krutil.$(SUF) spm_project.$(SUF) spm_hist2.$(SUF)\
spm_dilate_erode.$(SUF) spm_bwlabel.$(SUF) spm_get_lm.$(SUF)\
mat2file.$(SUF) file2mat.$(SUF) spm_invdef.$(SUF)
spm_invdef.$(SUF) mat2file.$(SUF) file2mat.$(SUF)

SUBDIRS=\
toolbox/DARTEL \
@@ -72,6 +72,7 @@ archive: spm_vol_utils.$(SUF).a

install: verb.install $(SPMMEX)
$(COPY) $(SPMMEX) ..
$(MOVE) ../file2mat.$(SUF) ../mat2file.$(SUF) ../@file_array/private

toolbox toolbox-all toolbox-clean toolbox-distclean toolbox-install toolbox-tarball:
@@for p in $(SUBDIRS); do \

0 comments on commit cbd4938

Please sign in to comment.