drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Merge remote-tracking branch 'refs/remotes/jackhumbert/master'

Browse source 
# Conflicts:
#	quantum/template/template.c
#	quantum/template/template.h
This commit is contained in:
IBNobody 2016-03-22 20:39:05 -05:00
commit ec62d9e85c
88 changed files with 34428 additions and 41597 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tmk_core/common/matrix.h
View file

@ -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
}