Skip to content

adding font with license file #107

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 4 commits into from
Jan 17, 2021
Merged

Conversation

FoamyGuy
Copy link
Contributor

Font change as mentioned in #106

Also fix one of the examples for built-in screens.

@FoamyGuy
Copy link
Contributor Author

I think this may not be able to pass without the changes from #106

The easiest way that I know of to get everything back together is merge from the branch used for #106 and this PR can supersede that one, it will all of those commits, plus mine from here. I'll give that a try but open to other ideas if there is an easier way that I am missing.

@FoamyGuy FoamyGuy merged commit 9b7fc23 into adafruit:master Jan 17, 2021
@FoamyGuy FoamyGuy deleted the change_font branch January 17, 2021 18:04
adafruit-adabot added a commit to adafruit/Adafruit_CircuitPython_Bundle that referenced this pull request Jan 18, 2021
Updating https://github.com/adafruit/Adafruit_CircuitPython_Bitmap_Font to 1.3.3 from 1.3.2:
  > Merge pull request adafruit/Adafruit_CircuitPython_Bitmap_Font#36 from FoamyGuy/change_font
  > Added pre-commit-config file
  > Added pre-commit and SPDX copyright

Updating https://github.com/adafruit/Adafruit_CircuitPython_Display_Text to 2.11.2 from 2.11.0:
  > Merge pull request adafruit/Adafruit_CircuitPython_Display_Text#109 from kmatch98/fix_anchor_point
  > Merge pull request adafruit/Adafruit_CircuitPython_Display_Text#107 from FoamyGuy/change_font
  > Added pre-commit-config file
  > Added pre-commit and SPDX copyright
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.

3 participants