enhancement: also pass elec if it's in the hdr
fieldtrip2fiff converts raw, epoched, and timelocked data + test for CTF, neuromag, EEG
resolved merge conflict between svn and github, the only way was to allow the conflict to affect the file for some commits. This commit reverts the file back to the desired state.
Merge pull request #13 from oostenveld/bug1967-mergeconflict

resolved merge conflict between svn and github
Merge pull request #11 from gpiantoni/addelec

enhancement: also pass elec if it's in the hdr
Merge pull request #12 from gpiantoni/fiff

fieldtrip2fiff converts raw, epoched, and timelocked data
enhancement - started making a test script for bug 1967

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7814 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@7815 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@7816 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@7817 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@7818 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
merge conflict

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7819 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
enhancement: also pass elec if it's in the hdr

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7820 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
fieldtrip2fiff converts raw, epoched, and timelocked data + test for CTF, neuromag, EEG

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7821 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
resolved merge conflict between svn and github, the only way was to allow the conflict to affect the file for some commits. This commit reverts the file back to the desired state.

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

Conflicts:
	test/test_bug1967.m
enhancement - started making a test script for bug 1967

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7823 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@7824 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@7825 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@7826 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0