avr/qmk/firmware - [no description]

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware	cbbrowne	2016-08-22	98	-606/+8317
\|\
\| *	Fixing Dvorak	Kyle Berry	2016-08-21	1	-1/+1
\| *	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
\| \|\ \
\| \| * \	Merge remote-tracking branch 'upstream/master'	Xyverz	2016-08-19	61	-86/+6509
\| \| \|\ \
\| \| * \| \|	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
\| * \| \| \|	Merge pull request #662 from toneman77/iso_satan	Jack Humbert	2016-08-19	6	-85/+117
\| \|\ \ \ \
\| \| * \| \| \|	made a correct default KEYMAP. moved the old one to KEYMAP_ANSI	Toni	2016-08-18	5	-59/+86
\| \| * \| \| \|	cleanup, readability , shift swap in ISO_SPLIT_RSHIFT	Toni	2016-08-18	1	-17/+20
\| \| * \| \| \|	corrected the split rshift key to reality	Toni	2016-08-18	2	-9/+11
\| * \| \| \| \|	Merge pull request #663 from tomb0y/kc60_workman_dead	Jack Humbert	2016-08-19	3	-0/+200
\| \|\ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
\| \| * \| \| \|	Add the workman-dead layout for kc60	zs	2016-08-19	3	-0/+200
\| * \| \| \| \|	forgot media keys	Toni	2016-08-19	1	-1/+1
\| * \| \| \| \|	Merge remote-tracking branch 'origin/master' into amj60	Toni	2016-08-19	47	-89/+5699
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Added dbroqua layout for planck keyboard	Damien	2016-08-18	1	-0/+314
\| \| * \| \| \| \|	Merge pull request #652 from iFreilicht/master	Jack Humbert	2016-08-18	40	-0/+5227
\| \| \|\ \ \ \ \
\| \| \| * \| \| \| \|	Added info to docs	Felix Uhl	2016-08-18	1	-1/+1
\| \| \| * \| \| \| \|	Merge pull request #1 from jackhumbert/master	Felix Uhl	2016-08-18	100	-1407/+6306
\| \| \| \|\ \ \ \ \ \| \| \| \| \| \|/ / / \| \| \| \| \|/\| \| \|
\| \| \| * \| \| \| \|	Bugfixes	Felix Uhl	2016-08-18	1	-6/+7
\| \| \| * \| \| \| \|	Final link fix	Felix Uhl	2016-08-18	1	-2/+2
\| \| \| * \| \| \| \|	More link fixing	Felix Uhl	2016-08-18	1	-6/+6
\| \| \| * \| \| \| \|	Fixed links again	Felix Uhl	2016-08-18	1	-2/+2
\| \| \| * \| \| \| \|	Fixed dead link	Felix Uhl	2016-08-18	1	-1/+1
\| \| \| * \| \| \| \|	Minor documentation changes	Felix Uhl	2016-08-18	2	-28/+21
\| \| \| * \| \| \| \|	Fixed links again	Felix Uhl	2016-08-18	1	-3/+5
\| \| \| * \| \| \| \|	Fixed pictures and links	Felix Uhl	2016-08-18	1	-15/+13
\| \| \| * \| \| \| \|	Documentation overhaul.	Felix Uhl	2016-08-18	10	-9/+3138
\| \| \| * \| \| \| \|	Small changes, renamed keymap	Felix Uhl	2016-08-18	4	-213/+236
\| \| \| * \| \| \| \|	Minor changes to felix keymap	Felix Uhl	2016-08-15	3	-17/+54
\| \| \| * \| \| \| \|	Ported all keymaps	Felix Uhl	2016-08-14	14	-92/+115
\| \| \| * \| \| \| \|	Update readme.md	Felix Uhl	2016-08-14	1	-1/+1
\| \| \| * \| \| \| \|	Fixed links to keymap sources	Felix Uhl	2016-08-14	1	-14/+13
\| \| \| * \| \| \| \|	Added all original S60-X keymaps	Felix Uhl	2016-08-14	28	-150/+1579
\| \| \| * \| \| \| \|	Small changes	Felix Uhl	2016-08-11	2	-9/+10
\| \| \| * \| \| \| \|	Minor changes to keymaps	Felix Uhl	2016-08-11	3	-9/+12
\| \| \| * \| \| \| \|	Added S60-X to keyboards with two layouts.	Felix Uhl	2016-08-11	11	-0/+589
\| \| * \| \| \| \| \|	Merge pull request #650 from Xyverz/master	Jack Humbert	2016-08-18	5	-88/+157
\| \| \|\ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|/ \| \| \| \|/\| \| \| \|
\| \| \| * \| \| \| \|	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