qmk_firmware - [no description]

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fixed line ending	IBNobody	2016-08-23	1	-1/+1
\|
*	Merge remote-tracking branch 'refs/remotes/jackhumbert/master'	IBNobody	2016-08-23	46	-2656/+2973
\|\
\| *	Merge pull request #669 from fredizzimo/windows10_build_instructions	Jack Humbert	2016-08-21	1	-2/+49
\| \|\ \| \| \| \| \| \|	Add instructions for Windows 10 subsystem for Linux
\| \| *	Add warning about line endings	Fred Sundvik	2016-08-20	1	-0/+2
\| \| \|
\| \| *	Add instructions for Windows 10 subsystem for Linux	Fred Sundvik	2016-08-20	1	-2/+47
\| \| \| \| \| \| \| \| \| \| \| \|	Also simplify the linux instructions
\| * \|	Merge pull request #668 from fredizzimo/line_endings	Jack Humbert	2016-08-21	27	-2169/+2262
\| \|\ \ \| \| \| \| \| \| \| \|	Enforce correct line endings
\| \| * \|	Normalize line endings	Fred Sundvik	2016-08-20	26	-2169/+2169
\| \| \| \|
\| \| * \|	Add .gitattributes to ensure correct line endings	Fred Sundvik	2016-08-20	1	-0/+93
\| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	It also ensures that make files and shell script are checked out with lf endings, for compability with the Windows 10 bash
\| * \|	Merge pull request #674 from kyleberry/master	Jack Humbert	2016-08-21	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \|	Fixing Dvorak
\| \| * \|	Fixing Dvorak	Kyle Berry	2016-08-21	1	-1/+1
\| \|/ / \| \| \| \| \| \| \| \| \|	Updating with proper Dvorak layout.
\| * \|	Merge pull request #665 from linsomniac/keymap_jafo	Jack Humbert	2016-08-20	5	-0/+213
\| \|\ \ \| \| \| \| \| \| \| \|	Adding jafo layout.
\| \| * \|	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
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Got rid of all the kludge in my ErgoDox keymap.
\| \| * \ \	Merge remote-tracking branch 'upstream/master'	Xyverz	2016-08-19	66	-92/+6560
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\|
\| \| * \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated readme.md to reflect this change.
\| * \| \| \|	Merge pull request #630 from nrrkeene/master	Jack Humbert	2016-08-20	10	-275/+237
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|	The Ordinary Layout is the unsurprising layout
\| \| * \| \|	The Ordinary Layout is boring because all the keys are where you expect them ↵	Nicholas Keene	2016-08-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to be
\| \| * \| \|	The Ordinary Layout is boring because all the keys are where you expect them ↵	Nicholas Keene	2016-08-19	8	-111/+98
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to be
\| \| * \| \|	The Ordinary Layout is the unsurprising layout	Nicholas Keene	2016-08-13	10	-183/+158
\| \| \| \| \|
* \| \| \| \|	Merge	IBNobody	2016-08-20	1	-356/+194
\| \| \| \| \|
* \| \| \| \|	Merge	IBNobody	2016-08-20	0	-0/+0
\|\ \ \ \ \
\| * \ \ \ \	Merge	IBNobody	2016-08-20	0	-0/+0
\| \|\ \ \ \ \
\| \| * \ \ \ \	Merge https://github.com/IBNobody/qmk_firmware	IBNobody	2016-08-19	1	-22/+22
\| \| \|\ \ \ \ \
\| \| \| * \| \| \| \|	fixed color detection routine in makefile	IBNobody	2016-06-11	1	-30/+28
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Merge remote-tracking branch 'remotes/jackhumbert/master'	IBNobody	2016-06-11	728	-90650/+141429
\| \| \| \|\ \ \ \ \
\| \| \| * \ \ \ \ \	Merge remote-tracking branch 'remotes/jackhumbert/master'	IBNobody	2016-05-24	32	-792/+626
\| \| \| \|\ \ \ \ \ \
\| \| \| * \ \ \ \ \ \	Merge remote-tracking branch 'remotes/jackhumbert/master'	IBNobody	2016-05-24	124	-4257/+11726
\| \| \| \|\ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \	Merge remote-tracking branch 'refs/remotes/jackhumbert/master'	IBNobody	2016-05-02	142	-10819/+28668
\| \| \| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	fixed color detection routine in makefile	IBNobody	2016-08-19	1	-194/+356
\| \| \| \|_\|_\|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \|
\| * / \| \| \| \| \| \| \| \|	fixed color detection routine in makefile	IBNobody	2016-08-19	1	-194/+356
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	fixed color detection routine in makefile	IBNobody	2016-08-20	1	-194/+195
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	fixed color detection routine in makefile	IBNobody	2016-08-20	1	-0/+161
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #662 from toneman77/iso_satan	Jack Humbert	2016-08-19	6	-85/+117
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Satan Cleanup
\| * \| \| \| \| \| \| \| \|	made a correct default KEYMAP. moved the old one to KEYMAP_ANSI	Toni	2016-08-18	5	-59/+86
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed all layouts that were referencing KEYMAP to KEYMAP_ANSI whitespace prettyfying
\| * \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed my keymap in the process to adjust to that
* \| \| \| \| \| \| \| \| \|	Merge pull request #663 from tomb0y/kc60_workman_dead	Jack Humbert	2016-08-19	3	-0/+200
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \|	Add the workman-dead layout for kc60
\| * \| \| \| \| \| \| \| \|	Add the workman-dead layout for kc60	zs	2016-08-19	3	-0/+200
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #660 from toneman77/amj60	Jack Humbert	2016-08-19	10	-0/+650
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	new keyboard: AMJ60
\| * \| \| \| \| \| \| \| \| \|	forgot media keys	Toni	2016-08-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into amj60	Toni	2016-08-19	52	-95/+5750
\| \|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	merge with upstream
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #655 from Dbroqua/patch-1	Jack Humbert	2016-08-18	1	-0/+314
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added dbroqua layout for planck keyboard
\| * \| \| \| \| \| \| \| \| \| \|	Added dbroqua layout for planck keyboard	Damien	2016-08-18	1	-0/+314
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #656 from Vifon/dynamic_macros	Jack Humbert	2016-08-18	1	-2/+6
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Improve the dynamic macro documentation
\| * \| \| \| \| \| \| \| \| \| \|	Improve the dynamic macro documentation	Wojciech Siewierski	2016-08-19	1	-2/+6
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #652 from iFreilicht/master	Jack Humbert	2016-08-18	41	-0/+5228
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added S60-X keyboard
\| * \| \| \| \| \| \| \| \| \| \|	Added info to docs	Felix Uhl	2016-08-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|