added conflicting file back

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7833 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
enhancement - use consistent naming of coordsys insread of coordinates for options, see http://bugzilla.fcdonders.nl/show_bug.cgi?id=2114

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7834 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
enhancement/bugfix1965: all specest functions now give warnings when
there is a mismatch between input and output freqoi/timeoii (not a
warning_once)

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7835 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
bugfix: when freqoi = 'all' and timwin is a scalar, timwin is expanded

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7836 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
enhancement+bugfix: all specest functions now give an appropriate
warning when the requested frequency resolution is unattainable with the
requested padding. Bugfix, I forgot an abs in the checks for differences

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7837 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
bugfix: test script contained reference to nonexistent layout, fixed

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7838 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
bugfix2086: when an empty previous field is part of the config,
ft_findcfg searches endlessly in an eternal loop. Fixed by putting an
isempty check in the beginning

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7839 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
Merge branch 'master' of github.com:fieldtrip/fieldtrip