qmk_firmware - [no description]

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #1010 from SjB/oneshot_timeout_fix	Jack Humbert	2017-02-06	1	-8/+8
\|\
\| *	moved oneshot cancellation code outside of process_record.	SjB	2017-01-29	1	-8/+8
\| *	oneshot timeout would only timeout after an event.	SjB	2017-01-15	1	-7/+7
* \|	Merge branch 'master' of github.com:jackhumbert/qmk_firmware	Jack Humbert	2017-02-06	1	-1/+10
\|\ \
\| * \	Merge pull request #981 from jonasoberschweiber/osx-surrogate-pairs	Jack Humbert	2017-02-06	1	-1/+10
\| \|\ \
\| \| * \|	Add support for supplementary planes for OS X	Jonas Oberschweiber	2016-12-31	1	-1/+10
* \| \| \|	[skip build] testing travis script	Jack Humbert	2017-02-06	1	-1/+1
\|/ / /
* \| \|	[skip build] testing travis script	Jack Humbert	2017-02-06	2	-1/+3
* \| \|	Merge pull request #1030 from SjB/refactor_register_code16	Jack Humbert	2017-02-06	1	-2/+30
\|\ \ \
\| * \| \|	registering a weak_mods when using register_code16	SjB	2017-01-29	1	-4/+24
\| * \| \|	speeding up (un)register_code16	SjB	2017-01-23	1	-2/+10
* \| \| \|	[skip build] testing travis script	Jack Humbert	2017-02-06	1	-1/+1
* \| \| \|	[skip build] testing travis script	Jack Humbert	2017-02-06	1	-1/+5
* \| \| \|	[skip build] testing travis script	Jack Humbert	2017-02-06	1	-1/+1
* \| \| \|	[skip build] testing travis script	Jack Humbert	2017-02-06	1	-3/+1
* \| \| \|	[skip build] testing travis script	Jack Humbert	2017-02-06	2	-19/+25
* \| \| \|	fixes qmk.fm linking, tests out auto version incrementing	Jack Humbert	2017-02-06	1	-1/+20
* \| \| \|	Merge pull request #1063 from osamuaoki/master	Erez Zukerman	2017-02-02	1	-18/+18
\|\ \ \ \
\| * \| \| \|	Typo fixes	Osamu Aoki	2017-02-02	1	-18/+18
* \| \| \| \|	Merge pull request #1058 from edasque/master	Erez Zukerman	2017-02-02	1	-1/+2
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Reverted Dockerfile to put the CMD back	Erik Dasque	2017-01-31	1	-1/+2
* \| \| \| \|	Merge pull request #1049 from SjB/tap_dance_save_oneshot_mods	Erez Zukerman	2017-02-01	2	-1/+7
\|\ \ \ \ \
\| * \| \| \| \|	race condition between oneshot_mods and tap_dance	SjB	2017-01-29	2	-1/+7
* \| \| \| \| \|	Merge pull request #1054 from deadcyclo/master	Erez Zukerman	2017-02-01	7	-103/+384
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Merge remote-tracking branch 'upstream/master'	Brendan Johan Lee	2017-02-01	5	-30/+900
\| \|\ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #1039 from zabereer/albert_ergodox_keymap	Erez Zukerman	2017-01-31	4	-0/+866
\|\ \ \ \ \ \
\| * \| \| \| \| \|	albert ergodox keymap	Albert Pretorius	2017-01-26	4	-0/+866
* \| \| \| \| \| \|	Merge pull request #1055 from matzebond/master	Erez Zukerman	2017-01-31	1	-30/+34
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	update my neo2 keymap	Matthias Schmitt	2017-01-30	1	-30/+34
\|/ / / / / /
\| \| * \| \| \|	[deadcyclo layout] Refactoring. Use custom functions and macros	Brendan Johan Lee	2017-01-30	1	-237/+266
\| \| * \| \| \|	[deadcyclo layout] fixed failing tests	Brendan Johan Lee	2017-01-30	1	-16/+1
\| \| * \| \| \|	Merge remote-tracking branch 'upstream/master'	Brendan Johan Lee	2017-01-30	2	-2/+18
\| \| \|\ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #1043 from potz/patch-1	skullydazed	2017-01-27	1	-0/+16
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Clarify license on abnt2 keymap (#1038)	Potiguar Faga	2017-01-27	1	-0/+16
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #869 from dylanjgscott/master	Jack Humbert	2017-01-27	1	-2/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Compare Makefile with itself instead of using `--help`	Dylan Scott	2017-01-24	1	-2/+2
\| \| \| * \| \| \|	Merge remote-tracking branch 'upstream/master'	Brendan Johan Lee	2017-01-27	16	-22/+22
\| \| \| \|\ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #1035 from qmk/qmk_org_changes	Jack Humbert	2017-01-27	16	-22/+22
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	replace jackhumbert with qmk	Jack Humbert	2017-01-26	16	-22/+22
\|/ / / / / /
\| \| * \| \| \|	[deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keys	Brendan Johan Lee	2017-01-27	4	-23/+26
\| \| * \| \| \|	Merge remote-tracking branch 'upstream/master'	Brendan Johan Lee	2017-01-26	11	-16/+403
\| \| \|\ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #1029 from SjB/qmk_infinity60	Jack Humbert	2017-01-26	5	-0/+46
\|\ \ \ \ \ \
\| * \| \| \| \| \|	updated all the other keymaps to support the new changes.	SjB	2017-01-24	3	-0/+28
\| * \| \| \| \| \|	fix: infinity60 keyboard was not using quantum features.	SjB	2017-01-23	2	-0/+18
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #1033 from smt/smt/preonic	Jack Humbert	2017-01-26	3	-0/+335
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Remove COLEMAK from preonic_keycodes enum	Stephen Tudor	2017-01-25	1	-1/+0
\| * \| \| \| \| \|	Update readme for smt Preonic keymap	Stephen Tudor	2017-01-25	1	-1/+85
\| * \| \| \| \| \|	Add smt keymap for Preonic	Stephen Tudor	2017-01-25	3	-0/+252
* \| \| \| \| \| \|	Add gitter image, start update to qmk org	Jack Humbert	2017-01-26	1	-3/+3
* \| \| \| \| \| \|	Merge branch 'master' of github.com:jackhumbert/qmk_firmware	Jack Humbert	2017-01-25	3	-3/+66
\|\\| \| \| \| \| \|