Merge pull request #815 from priyadi/unicode_map

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

Sun, 16 Oct 2016 19:49:45 +0000 (15:49 -0400)

committer GitHub <noreply@github.com>

Sun, 16 Oct 2016 19:49:45 +0000 (15:49 -0400)
author Jack Humbert <jack.humb@gmail.com>
Sun, 16 Oct 2016 19:49:45 +0000 (15:49 -0400)
committer GitHub <noreply@github.com>
Sun, 16 Oct 2016 19:49:45 +0000 (15:49 -0400)
diff --cc quantum/keymap.h
Simple merge
diff --cc readme.md
Simple merge
author	Jack Humbert <jack.humb@gmail.com>
	Sun, 16 Oct 2016 19:49:45 +0000 (15:49 -0400)
committer	GitHub <noreply@github.com>
	Sun, 16 Oct 2016 19:49:45 +0000 (15:49 -0400)
		1	2
quantum/keymap.h	patch \|	diff1 \|	diff2 \|	blob \| history
readme.md	patch \|	diff1 \|	diff2 \|	blob \| history