Merge pull request #960 from ofples/feature/combos

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

Tue, 7 Feb 2017 00:31:45 +0000 (19:31 -0500)

committer GitHub <noreply@github.com>

Tue, 7 Feb 2017 00:31:45 +0000 (19:31 -0500)
author Jack Humbert <jack.humb@gmail.com>
Tue, 7 Feb 2017 00:31:45 +0000 (19:31 -0500)
committer GitHub <noreply@github.com>
Tue, 7 Feb 2017 00:31:45 +0000 (19:31 -0500)
diff --cc build_keyboard.mk
Simple merge
diff --cc quantum/quantum.c
Simple merge
author	Jack Humbert <jack.humb@gmail.com>
	Tue, 7 Feb 2017 00:31:45 +0000 (19:31 -0500)
committer	GitHub <noreply@github.com>
	Tue, 7 Feb 2017 00:31:45 +0000 (19:31 -0500)
		1	2
build_keyboard.mk	patch \|	diff1 \|	diff2 \|	blob \| history
quantum/quantum.c	patch \|	diff1 \|	diff2 \|	blob \| history