Merge pull request #844 from priyadi/unicode_wincompose_input

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

Wed, 26 Oct 2016 04:48:44 +0000 (00:48 -0400)

committer GitHub <noreply@github.com>

Wed, 26 Oct 2016 04:48:44 +0000 (00:48 -0400)
author Jack Humbert <jack.humb@gmail.com>
Wed, 26 Oct 2016 04:48:44 +0000 (00:48 -0400)
committer GitHub <noreply@github.com>
Wed, 26 Oct 2016 04:48:44 +0000 (00:48 -0400)
diff --cc quantum/process_keycode/process_unicode.c
Simple merge
author	Jack Humbert <jack.humb@gmail.com>
	Wed, 26 Oct 2016 04:48:44 +0000 (00:48 -0400)
committer	GitHub <noreply@github.com>
	Wed, 26 Oct 2016 04:48:44 +0000 (00:48 -0400)