Merge branch 'master' into chibios

2015-11-23 15:51:59 +00:00 · 2015-11-23 15:51:59 +00:00 · aa44c779ec
commit aa44c779ec
parent 41f5be3b7a 2f3f17dba2
5 changed files with 235 additions and 1 deletions
--- a/tmk_core/common/keycode.h
+++ b/tmk_core/common/keycode.h
@ -92,6 +92,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define KC_RO   KC_INT1
 #define KC_KANA KC_INT2
 #define KC_JYEN KC_INT3
+#define KC_JPY  KC_INT3
 #define KC_HENK KC_INT4
 #define KC_MHEN KC_INT5
 /* Keypad */