Merge master into bep008#77
Merged
robertoostenveld merged 60 commits intobids-standard:masterfrom Apr 25, 2018
Merged
Conversation
added example dataset with MEG+EEG+fMRI
…sample_auditory include BrainStorm sample auditory dataset in BIDS-MEG format
…data include example BIDS dataset from MNE
…istent with their representation on openfmri.org, see bids-standard#38
corrected meg events onsets
…mples more meg examples
fid.json --> coordsystem.json
…he name Coodsystem, Headshape and Photo, files don't need to include *_task-label in the name. They are session specific
Merge remote-tracking branch 'guiomar/bep008_meg' into bep008_meg
Collaborator
Author
|
Hi @chrisfilo, are you OK with me merging this? |
Contributor
|
Go ahead
…On Wed, Apr 25, 2018, 3:06 AM Robert Oostenveld ***@***.***> wrote:
Hi @chrisfilo <https://github.com/chrisfilo>, are you OK with me merging
this?
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#77 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AAOkp02e_W9EnLZKk2421dMO6wSqtQ6Xks5tsEqdgaJpZM4TZloV>
.
|
Collaborator
Author
|
thanks! |
sappelhoff
pushed a commit
that referenced
this pull request
May 12, 2019
Merge master into bep008 Former-commit-id: 9df7a1e
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
the master branch has moved on quite a bit. The consequence is that bep008_meg is getting outdated and more difficult to maintain/update. This PR aims to synchronize the two again.
There are no changes other than the ones that have been merged into master.
See also #76