documentation - bug2082 - avg is optional field. name of function is _TIMELOCK not _FREQ
Merge pull request #17 from johanna-zumer/master

timelock not freq
bugfix - removed spherical coordinates warning - see bug2132
documentation of ft_volumesegment updated with description of possible combination of output, and ensured that tpm is probabilistic when tpm is the input
a

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@8063 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
automatically synchronized identical files to revision 8063

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@8064 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
Merge branch 'svn'
Merge branch 'master' into svn
Merge branch 'warnseg'
bugfix - bug1794 - cfg.sourcunits default now set to 'cm' irrespective.
documentation update related to previous change (bug1794)
bugfix - small fix for 3d style as used in spm, see http://bugzilla.fcdonders.nl/show_bug.cgi?id=2111#c7


git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@8065 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
enhancement - added test script for bug with global variable, related to egi_mff_v2, see http://bugzilla.fcdonders.nl/show_bug.cgi?id=2133


git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@8066 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
Merge pull request #18 from Horschig/master

bugfix #2127 - fprintf statement conditionalized appropriately
Merge pull request #19 from jimher/channelrepair

bugfix - removed spherical coordinates warning - see bug2132
Merge pull request #20 from lillamagyari/master

 ft_volumesegment
Merge pull request #21 from johanna-zumer/master

set cfg.sourceunits default for prepare_headmodel.m
Merge branch 'svn'
bugfix #2140 - padding with in memory data fixed and for data on disk
Merge branch 'master' of github.com:fieldtrip/fieldtrip into workspace