Merge branch 'master' of github.com:fieldtrip/fieldtrip into git
bugfix: it used to be the case that a timeoi that was too finely sampled would contain multiples of the same bin after translation to time-points in the data. Now, the behaviour is similar to freqoi. When the requested timeio is too finely sampled, dubplicates are removed, and a warning is given.


git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7919 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
Merge branch 'master' of github.com:fieldtrip/fieldtrip into git
enhancement - started making a test script for bug 1967

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7920 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
enhancement - extended test script for http://bugzilla.fcdonders.nl/show_bug.cgi?id=1967

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7921 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
bugfix #2099 - variable name corrected

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7922 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
bugfix - fixed the commit in r7774 which introduced an unknown variable padlength, see also bug2099

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7923 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
resolving merge conflict between svn and git

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7924 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
resolving merge conflict

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7925 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
enhancement - started making a test script for bug 1967

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7926 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
fixed merge conflict related to test_bug1967

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7927 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
enhancement - started making a test script for bug 1967

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7928 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
enhancement - extended test script for http://bugzilla.fcdonders.nl/show_bug.cgi?id=1967

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7929 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
enhancement - started making a test script for bug 1967

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7930 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
enhancement - extended test script for http://bugzilla.fcdonders.nl/show_bug.cgi?id=1967

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7931 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
enhancement - started making a test script for bug 1967

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7932 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
merge conflict

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7933 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
enhancement - started making a test script for bug 1967

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7934 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
enhancement - extended test script for http://bugzilla.fcdonders.nl/show_bug.cgi?id=1967

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7935 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
enhancement - started making a test script for bug 1967

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7936 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0