Merge pull request #1112 from newsboytko/newsboytko/midi-keycodes

author Jack Humbert <jack.humb@gmail.com>

Tue, 28 Mar 2017 13:26:54 +0000 (09:26 -0400)

committer GitHub <noreply@github.com>

Tue, 28 Mar 2017 13:26:54 +0000 (09:26 -0400)
author Jack Humbert <jack.humb@gmail.com>
Tue, 28 Mar 2017 13:26:54 +0000 (09:26 -0400)
committer GitHub <noreply@github.com>
Tue, 28 Mar 2017 13:26:54 +0000 (09:26 -0400)
diff --cc quantum/quantum.c
Simple merge
diff --cc quantum/quantum.h
Simple merge
diff --cc quantum/quantum_keycodes.h
Simple merge
diff --cc tmk_core/protocol/lufa/lufa.c
Simple merge
author	Jack Humbert <jack.humb@gmail.com>
	Tue, 28 Mar 2017 13:26:54 +0000 (09:26 -0400)
committer	GitHub <noreply@github.com>
	Tue, 28 Mar 2017 13:26:54 +0000 (09:26 -0400)
		1	2
quantum/quantum.c	patch \|	diff1 \|	diff2 \|	blob \| history
quantum/quantum.h	patch \|	diff1 \|	diff2 \|	blob \| history
quantum/quantum_keycodes.h	patch \|	diff1 \|	diff2 \|	blob \| history
tmk_core/protocol/lufa/lufa.c	patch \|	diff1 \|	diff2 \|	blob \| history