qmk_firmware - [no description]

	Commit message (Expand)	Author	Age	Files	Lines
*	Moved PREVENT_STUCK_MODIFIERS to config.h	Joshua T	2016-07-30	2	-3/+3
*	Moved my Ergodox keymap to match upstream changes	Joshua T	2016-07-30	2	-8/+10
*	Merge remote-tracking branch 'upstream/master'	Joshua T	2016-07-30	245	-1742/+3096
\|\
\| *	Merge pull request #589 from algernon/h/ergodox_ez-vs-ergodox	Jack Humbert	2016-07-30	7	-9/+9
\| \|\
\| \| *	Update some obsolete references	Gergely Nagy	2016-07-30	7	-9/+9
\| \|/
\| *	Merge pull request #587 from fredizzimo/documentation_quick_fix	Jack Humbert	2016-07-29	1	-13/+15
\| \|\
\| \| *	Fix the quick aliases documentation section	Fred Sundvik	2016-07-29	1	-13/+15
\| * \|	Merge pull request #503 from fredizzimo/ergodox_subproject	Jack Humbert	2016-07-29	225	-1795/+1651
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	Small fix for infinity include guard	Fred Sundvik	2016-07-29	1	-3/+3
\| \| *	Fix typo in the readme.	Fred Sundvik	2016-07-29	1	-1/+1
\| \| *	A couple of more Ergodox readme fixes	Fred Sundvik	2016-07-29	1	-2/+2
\| \| *	Unify the ErgoDox EZ and Infinity documentation	Fred Sundvik	2016-07-29	1	-8/+13
\| \| *	Refer to the right path in the readme	Fred Sundvik	2016-07-29	1	-1/+1
\| \| *	Move Ergodox readme from ez subfolder to parent	Fred Sundvik	2016-07-29	1	-0/+0
\| \| *	Include the main Makefile before including Ergodox infinity drivers	Fred Sundvik	2016-07-29	1	-4/+4
\| \| *	Move Infinity Ergodox drivers to subproject, and fix makefile	Fred Sundvik	2016-07-29	14	-2/+2
\| \| *	Remove the Infinity Ergodox default keymap	Fred Sundvik	2016-07-29	2	-282/+0
\| \| *	Cleanup the townk_osx config.h and make files	Fred Sundvik	2016-07-29	2	-52/+2
\| \| *	Rename supercoder config_user to config.h	Fred Sundvik	2016-07-29	1	-1/+1
\| \| *	Fix config.h include guards	Fred Sundvik	2016-07-29	2	-4/+4
\| \| *	Define weak matrix user function for Infinity Ergodox	Fred Sundvik	2016-07-29	1	-0/+9
\| \| *	Speed up ChibiOS keymap compilation	Fred Sundvik	2016-07-29	1	-17/+33
\| \| *	Change _delay_ms to wait_ms in algernon keymap	Fred Sundvik	2016-07-29	1	-1216/+1217
\| \| *	Move some of the Ergodox config settings to shared	Fred Sundvik	2016-07-29	3	-37/+37
\| \| *	Add empty led control functions to Infinity Ergodox	Fred Sundvik	2016-07-29	2	-0/+96
\| \| *	Most ergodox keymaps compiles on Infinity	Fred Sundvik	2016-07-29	21	-32/+46
\| \| *	All Ez keymaps compiles	Fred Sundvik	2016-07-29	58	-58/+70
\| \| *	Initial structure for Ergodox as subprojects	Fred Sundvik	2016-07-29	219	-23/+58
\| \|/
\| *	Merge pull request #584 from algernon/ergodox-ez/algernon	Erez Zukerman	2016-07-29	4	-28/+687
\| \|\
\| \| *	ergodox_ez: Upgrade my keymap to v1.4	Gergely Nagy	2016-07-29	4	-28/+687
\| * \|	Merge pull request #583 from coderkun/coderkun_neo2	Erez Zukerman	2016-07-29	2	-7/+15
\| \|\ \
\| \| * \|	disable sleep LED	coderkun	2016-07-29	1	-1/+2
\| \| * \|	complete labels for modifiers in keymap schema	coderkun	2016-07-29	1	-2/+2
\| \| * \|	use Ergodox EZ’s third LED for “scroll lock”	coderkun	2016-07-29	1	-2/+9
\| \| * \|	fix grave (GRV) and acute (ACUT) accents	coderkun	2016-07-29	1	-2/+2
\| \| \|/
\| * \|	Merge pull request #580 from MatsLanGoH/patch-1	Erez Zukerman	2016-07-29	1	-1/+1
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	Fixed a typo	Matthias	2016-07-29	1	-1/+1
\| \|/
\| *	Merge pull request #578 from 0xdec/master	Jack Humbert	2016-07-28	4	-0/+234
\| \|\
\| \| *	Create 0xdec Preonic keymap	Jordi Orlando	2016-07-28	4	-0/+234
\| * \|	Merge pull request #577 from hot-leaf-juice/master	Jack Humbert	2016-07-28	3	-0/+211
\| \|\ \
\| \| * \|	Added readme.md for custom layout.	Callum Oakley	2016-07-28	1	-0/+48
\| \| * \|	Added custom keymap.	Callum Oakley	2016-07-27	2	-0/+163
\| * \| \|	Merge pull request #573 from algernon/f/make-all-stop-on-error	Jack Humbert	2016-07-28	1	-2/+2
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|
\| \| * \|	tmk_core/rules.mk: Make PRINT_ERROR* stop on error	Gergely Nagy	2016-07-27	1	-2/+2
\| \| \|/
\| * \|	Merge pull request #572 from algernon/f/tap-dance-debug	Jack Humbert	2016-07-28	2	-0/+16
\| \|\ \
\| \| * \|	tap-dance: Add some debugging support	Gergely Nagy	2016-07-27	2	-0/+16
\| \| \|/
\| * \|	Merge pull request #570 from sethbc/fix_bone2planck_build	Jack Humbert	2016-07-28	1	-10/+8
\| \|\ \
\| \| * \|	remove unnecessary includes	Seth Chandler	2016-07-27	1	-2/+0
\| \| * \|	fix numerous errors in bone2planck keymap	Seth Chandler	2016-07-27	1	-10/+10
\| \| \|/
\| * \|	Merge pull request #569 from sethbc/fix_stanleylai_warnings	Jack Humbert	2016-07-28	1	-10/+5
\| \|\ \