Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7

This commit is contained in:
Jack Humbert 2016-11-28 23:51:07 -05:00
commit 6e0f994950
22 changed files with 1415 additions and 56 deletions

View file

@ -22,6 +22,7 @@ void register_hex(uint16_t hex);
bool process_unicode(uint16_t keycode, keyrecord_t *record);
#ifdef UNICODEMAP_ENABLE
void unicode_map_input_error(void);
bool process_unicode_map(uint16_t keycode, keyrecord_t *record);
#endif