diff options
author | Noah Andrews <NoahAndrews@users.noreply.github.com> | 2016-03-28 18:37:39 -0400 |
---|---|---|
committer | Noah Andrews <NoahAndrews@users.noreply.github.com> | 2016-03-28 18:37:39 -0400 |
commit | 535daad3cd812df58f4630df202a447836ac3084 (patch) | |
tree | 4591f47555acb1d88f08caa7ab3bbb40fd828637 /keyboard/atomic/atomic.h | |
parent | ccf848917b7e931327f6c4a469877e9d8ef238ea (diff) | |
parent | 4a43c5684476611370820bd9592712754c211c52 (diff) | |
download | firmware-535daad3cd812df58f4630df202a447836ac3084.tar.gz firmware-535daad3cd812df58f4630df202a447836ac3084.tar.bz2 firmware-535daad3cd812df58f4630df202a447836ac3084.zip |
Merge remote-tracking branch 'jackhumbert/master' into improve-buildguide
Diffstat (limited to 'keyboard/atomic/atomic.h')
-rw-r--r-- | keyboard/atomic/atomic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keyboard/atomic/atomic.h b/keyboard/atomic/atomic.h index 95982ecad..d8574efa9 100644 --- a/keyboard/atomic/atomic.h +++ b/keyboard/atomic/atomic.h @@ -24,7 +24,7 @@ { K40, K41, KC_NO, K43, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E } \ } -void * matrix_init_user(void); -void * matrix_scan_user(void); +void matrix_init_user(void); +void matrix_scan_user(void); #endif
\ No newline at end of file |