diff options
| author | Dan Halbert <halbert@adafruit.com> | 2019-08-05 22:54:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-05 22:54:12 -0400 |
| commit | 1e8800117a8b727fbee708bc352e958498f45472 (patch) | |
| tree | 0d7ef6bcc62b491f88e97088d4aa3ee6e6fcc0a0 /supervisor/shared | |
| parent | 59efce30358d0112c5cdc033c9a3309ac965fbbf (diff) | |
| parent | 26f64dd8ecd488c3f9867362436825f55ae3def9 (diff) | |
Merge pull request #2040 from tannewt/merge_in_410
Merge 4.1.0 into master
Diffstat (limited to 'supervisor/shared')
| -rw-r--r-- | supervisor/shared/display.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/supervisor/shared/display.h b/supervisor/shared/display.h index d5faa7777..2a2ccf46d 100644 --- a/supervisor/shared/display.h +++ b/supervisor/shared/display.h @@ -35,11 +35,10 @@ // These are autogenerated resources. // This is fixed so it doesn't need to be in RAM. -extern const displayio_bitmap_t supervisor_terminal_font_bitmap; - extern const fontio_builtinfont_t supervisor_terminal_font; // These will change so they must live in RAM. +extern displayio_bitmap_t supervisor_terminal_font_bitmap; extern displayio_tilegrid_t supervisor_terminal_text_grid; extern terminalio_terminal_obj_t supervisor_terminal; |