Skip to content

Update frozen libraries #1961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 19, 2019
Merged

Update frozen libraries #1961

merged 2 commits into from
Jun 19, 2019

Conversation

tannewt
Copy link
Member

@tannewt tannewt commented Jun 19, 2019

This fixes HID mouse on CPX in particular

@tannewt tannewt added this to the 4.1.0 milestone Jun 19, 2019
@dhalbert
Copy link
Collaborator

I thought the HID mouse fix was already in due to #1909 and then #1938 (merge from 4.0.x). But they could all use updating.

@tannewt
Copy link
Member Author

tannewt commented Jun 19, 2019

Weird, #1938 doesn't show the module updates but it does show the commit for it. Maybe the merge commit doesn't respect the new submodule commits? Did you do it with a local branch or just through github?

@tannewt tannewt requested a review from dhalbert June 19, 2019 20:57
@dhalbert
Copy link
Collaborator

That is really weird. I did it with a local branch. I basically never do commits through the github web interface.

I have a vague memory of having this problem before. Like you said, something about the merge commit not picking up the submodules.

Copy link
Collaborator

@dhalbert dhalbert left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for noticing that this was still a problem. We should figure out why the merge commit didn't pick up the submodules.

@dhalbert dhalbert merged commit 3863a6a into adafruit:master Jun 19, 2019
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.

2 participants