Setting dev up-to-date with master, plus incorporating additional changes made directly to dev (that were not made to master)#69
Merged
k1o0 merged 11 commits intocortex-lab:devfrom Oct 25, 2018
jkbhagatio:dev
Merged
Setting dev up-to-date with master, plus incorporating additional changes made directly to dev (that were not made to master)#69k1o0 merged 11 commits intocortex-lab:devfrom jkbhagatio:dev
k1o0 merged 11 commits intocortex-lab:devfrom
jkbhagatio:dev
Conversation
to-do: add more information on submodules?
pull CL rig after Miles' branch name changes (dev) & Alyx changes and issues notes (panel, water)
…stead of cortex-lab repos
Contributor
|
Great! Just make sure the .gitmodules file is correct and I'll merge |
k1o0
requested changes
Oct 25, 2018
Contributor
k1o0
left a comment
k1o0
left a comment
There was a problem hiding this comment.
Remove this change from the commit. Also npy-matlab probably doesn't need a dev branch...
Member
Author
|
changed .gitmodules back |
k1o0
added a commit
that referenced
this pull request
Jan 3, 2021
Setting dev up-to-date with master, plus incorporating additional changes made directly to dev (that were not made to master)
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
2 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.
No description provided.