Skip to content

Conversation

@jepler
Copy link

@jepler jepler commented Oct 3, 2020

This brings in the following, and updates us to the 1.0.4 release tag:

Submodule lib/protomatter 2a1ba8fa4..5f07ec618:

Bumping version for release
Merge pull request #21 from makermelissa/master
Merge pull request #20 from makermelissa/master
Merge pull request #18 from jepler/fix-cpy-3184
Merge pull request #14 from hierophect/cpy-timer-allocator

We previously had the changes of jepler/fix-cpy-3184 and
hierophect/cpy-timer-allocator but not their merge commits.

The only other changes in protomatter were one formatting change in the
core, plus several Arduino sketches. So this should make no practical
difference for CPy.

This brings in the following, and updates us to the 1.0.4 release tag:

Submodule lib/protomatter 2a1ba8fa4..5f07ec618:
  > Bumping version for release
  > Merge pull request adafruit#21 from makermelissa/master
  > Merge pull request adafruit#20 from makermelissa/master
  > Merge pull request adafruit#18 from jepler/fix-cpy-3184
  > Merge pull request adafruit#14 from hierophect/cpy-timer-allocator

We previously had the _changes_ of jepler/fix-cpy-3184 and
hierophect/cpy-timer-allocator but not their merge commits.

The only other changes in protomatter were one formatting change in the
core, plus several Arduino sketches.  So this should make no practical
difference for CPy.
Copy link
Member

@tannewt tannewt left a comment

Choose a reason for hiding this comment

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

Thanks!

@tannewt tannewt merged commit e7004af into adafruit:main Oct 5, 2020
@jepler jepler deleted the update-protomatter branch November 3, 2021 21:11
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