Som clean merge - #78
Merged
dankessler merged 34 commits intoJul 12, 2012
Merged
Conversation
…ated SOM_read_nii_img and added SOM_readNII.m
…ameters.Output.directory, noted by Mike A.
…tentation of runs.
…rs.masks, also did a fix to the TIME structure replication.
…file, the internal flag was not being created and set to zero, that is now done
Conflicts: som/SOM_ParseFileParam.m som/som_batch_mc_central.m
… changed to 4-digit numeric file name in SOM_CalculateCorrelationImages.m
Only conflict was a comment that @rcwelsh added to annotate a fix that had happened in parent1 anyway. Conflicts: som/SOM_CheckDataStructure.m
ghost
assigned
Member
Author
|
Going to go ahead and merge this manually since there is a small conflict (corrected by hand by @mangstad and I) that is preventing an auto merge |
Member
Author
|
Ok @rcwelsh, develop now includes latest and great in som stuff. Enjoy! |
Merged
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
3 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.
Per request by @rcwelsh this includes a bundling of all current work on som
Branches included in this bundle are...
som_cleanup
MAS_resting
SOM_zeros
som_fixes
som_batch
among other non-som specific ones