Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
# Conflicts: # quantum/template/template.c # quantum/template/template.h
This commit is contained in:
commit
ec62d9e85c
88 changed files with 34428 additions and 41597 deletions
|
@ -64,8 +64,8 @@ void matrix_power_up(void);
|
|||
void matrix_power_down(void);
|
||||
|
||||
/* keyboard-specific setup/loop functionality */
|
||||
void * matrix_init_kb(void);
|
||||
void * matrix_scan_kb(void);
|
||||
void matrix_init_kb(void);
|
||||
void matrix_scan_kb(void);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue