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

2016-11-28 23:51:07 -05:00
parent 7edac212c8 1585fc4b61
commit 6e0f994950
22 changed files with 1415 additions and 56 deletions
--- a/quantum/process_keycode/process_unicode.h
+++ b/quantum/process_keycode/process_unicode.h
@ -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