Skip to content

Spm8batch update stable channel - #97

Merged
dankessler merged 18 commits into
UMPsychMethodsCore:spm8Batch_stablefrom
dankessler:spm8Batch_pre_stable
Jul 30, 2012
Merged

Spm8batch update stable channel#97
dankessler merged 18 commits into
UMPsychMethodsCore:spm8Batch_stablefrom
dankessler:spm8Batch_pre_stable

Conversation

@dankessler

Copy link
Copy Markdown
Member

Updating spm8Batch_stable channel with stuff in spm8Batch_beta. Also, I merged in the latest develop. The diff for this is pretty massive because this latest develop includes all of the subtree squash that removes all of the toolboxes not slated for release, so there are lots of removals. If you really want to see the diff, best to fetch it directly, and use some clever shell scripting to only look at the diff that touches the spm8Batch subtree. In that case, you'll see that it's not that much changing at all, and is in fact equal to the diff visible in #96

@shijiaguo has been using the alpha channel (which is equivalent to the beta channel presently) to actively test for a while, so I will consider that effectively a +1 for testing and go ahead and merge it.

@ghost ghost assigned dankessler Jul 30, 2012
@dankessler

Copy link
Copy Markdown
Member Author

I will consider this comment a pseudo +1 from @shijiaguo for testing, since she has been testing the alpha channel (equivalent to beta now) for some time now.

dankessler added a commit that referenced this pull request Jul 30, 2012
@dankessler
dankessler merged commit 4516621 into UMPsychMethodsCore:spm8Batch_stable Jul 30, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant