Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
dd5a732eac
2 changed files with 2 additions and 2 deletions
|
@ -24,4 +24,4 @@ UNICODE_ENABLE = yes # Unicode
|
||||||
CUSTOM_MATRIX = yes
|
CUSTOM_MATRIX = yes
|
||||||
|
|
||||||
# project specific files
|
# project specific files
|
||||||
SRC += matrix.c
|
SRC += matrix.c serial_uart.c
|
||||||
|
|
|
@ -24,6 +24,6 @@ UNICODE_ENABLE = yes # Unicode
|
||||||
CUSTOM_MATRIX = yes
|
CUSTOM_MATRIX = yes
|
||||||
|
|
||||||
# project specific files
|
# project specific files
|
||||||
SRC += matrix.c
|
SRC += matrix.c serial_uart.c
|
||||||
|
|
||||||
DEFAULT_FOLDER = sirius/uni660/rev2/ansi
|
DEFAULT_FOLDER = sirius/uni660/rev2/ansi
|
||||||
|
|
Loading…
Reference in a new issue