qmk_firmware - [no description]

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'upstream/master'	Joshua T	2016-09-01	7	-205/+329
\|\
\| *	Merge remote-tracking branch 'upstream/master' into makefile_overhaul	Fred Sundvik	2016-08-26	1	-23/+142
\| \|\
\| \| *	Merge pull request #664 from linsomniac/infinity_readme	Erez Zukerman	2016-08-26	1	-23/+144
\| \| \|\
\| \| \| *	Making the existing firmware link better	Sean Reifschneider	2016-08-24	1	-1/+2
\| \| \| *	Changes based on @fredizzimo review, flashing Infinity details	Sean Reifschneider	2016-08-24	1	-0/+34
\| \| \| *	Changes from review by @fredizzimo and @Xyverz	Sean Reifschneider	2016-08-22	1	-19/+16
\| \| \| *	Tweaks after review.	Sean Reifschneider	2016-08-19	1	-3/+3
\| \| \| *	Restructuring of the ergodox README.	Sean Reifschneider	2016-08-19	1	-29/+105
\| \| \| *	Noting the change directory.	Sean Reifschneider	2016-08-19	1	-0/+1
\| \| \| *	Adding submodule note.	Sean Reifschneider	2016-08-19	1	-0/+1
\| \| \| *	Adding nicer Infinity build instructions.	Sean Reifschneider	2016-08-19	1	-0/+11
\| * \| \|	Merge remote-tracking branch 'upstream/master' into makefile_overhaul	Fred Sundvik	2016-08-24	3	-0/+419
\| \|\\| \|
\| * \| \|	Merge branch 'master' into makefile_overhaul	Fred Sundvik	2016-08-23	18	-484/+685
\| \|\ \ \
\| * \| \| \|	Update keyboard readme files with new makefile instructions	Fred Sundvik	2016-08-20	1	-3/+3
\| * \| \| \|	Split subproject make files into Makefile and rules.mk	Fred Sundvik	2016-08-20	4	-151/+157
\| * \| \| \|	Split keyboard makefiles into rules and Makefile	Fred Sundvik	2016-08-20	2	-31/+30
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge remote-tracking branch 'upstream/master'	Joshua T	2016-08-24	27	-1512/+2571
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	Merge pull request #677 from SmackleFunky/master	Jack Humbert	2016-08-23	3	-0/+419
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|
\| \| * \|	move to ergodox-ez only	Jason Green	2016-08-23	3	-0/+0
\| \| * \|	Remove unneeded include	Jason Green	2016-08-23	1	-1/+0
\| \| * \|	add missing #include	Jason Green	2016-08-23	1	-0/+1
\| \| * \|	TxBolt (Steno) Serial protocol for Ergodox Ez	Jason Green	2016-08-23	3	-0/+419
\| * \| \|	Add default swap configs for a couple of boards.	Joe Wasson	2016-08-20	1	-0/+24
\| \|/ /
\| * \|	Merge pull request #665 from linsomniac/keymap_jafo	Jack Humbert	2016-08-20	5	-0/+213
\| \|\ \
\| \| * \|	Bringing over changes from default map.	Sean Reifschneider	2016-08-19	1	-4/+3
\| \| * \|	Adding jafo layout.	Sean Reifschneider	2016-08-19	5	-0/+214
\| \| \|/
\| * \|	Merge pull request #658 from Xyverz/master	Jack Humbert	2016-08-20	2	-209/+211
\| \|\ \
\| \| * \|	Changed the Ergodox keymap to use the KEYMAP() macro, updated readme.md.	Xyverz	2016-08-19	2	-17/+10
\| \| * \|	Changed my keymap to match normal keymaps.	Xyverz	2016-08-19	1	-314/+198
\| \| * \|	Added compatibility for the Infinity ErgoDox to my Ergodox keymap.	Xyverz	2016-08-18	2	-53/+178
\| \| \|/
\| * \|	Merge pull request #630 from nrrkeene/master	Jack Humbert	2016-08-20	10	-275/+237
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	The Ordinary Layout is boring because all the keys are where you expect them ...	Nicholas Keene	2016-08-19	1	-1/+1
\| \| *	The Ordinary Layout is boring because all the keys are where you expect them ...	Nicholas Keene	2016-08-19	8	-111/+98
\| \| *	The Ordinary Layout is the unsurprising layout	Nicholas Keene	2016-08-13	10	-183/+158
\| * \|	One last change to the readme.	Xyverz	2016-08-18	1	-3/+1
\| * \|	One last formatting change	Xyverz	2016-08-18	1	-1/+1
\| * \|	more formatting changes	Xyverz	2016-08-18	1	-90/+90
\| * \|	Hopefully this fixes the layout diagrams.	Xyverz	2016-08-18	1	-91/+91
\| * \|	Added a readme, tidied up comments in the keymap.	Xyverz	2016-08-18	2	-29/+147
\| * \|	Merge branch 'master' of https://github.com/Xyverz/qmk_firmware	Xyverz	2016-08-17	1	-0/+5
\| \|\ \
\| \| * \|	Update readme.md	Xyverz	2016-08-17	1	-1/+1
\| \| * \|	Create readme.md	Xyverz	2016-08-17	1	-0/+5
\| * \| \|	tap-dance: Major rework, to make it more reliable	Gergely Nagy	2016-08-17	1	-1/+1
\| \|/ /
\| * \|	Merge remote-tracking branch 'upstream/master'	Xyverz	2016-08-13	6	-1237/+1244
\| \|\ \
\| \| * \|	ergodox: Update my keymap to v1.5	Gergely Nagy	2016-08-12	6	-1237/+1244
\| \| \|/
\| * \|	Adding my own layouts for the Phantom and Ergodox. My Ergodox layout adds per...	Ian Sterling	2016-08-09	1	-0/+311
\| * \|	Delete keymap.c	Xyverz	2016-08-08	1	-184/+0
\| * \|	Delete old_keymap.c	Xyverz	2016-08-08	1	-311/+0
\| * \|	Delete readme.md	Xyverz	2016-08-08	1	-10/+0
\| * \|	Delete dvorak.png	Xyverz	2016-08-08	1	-0/+0