avr/qmk/firmware - [no description]

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'upstream/master'	dbroqua	2016-08-23	86	-2749/+4770
\|\ \| \| \| \| \| \| \| \|	# Conflicts: # keyboards/planck/keymaps/dbroqua/keymap.c
\| *	Merge pull request #671 from Talljoe/one-hand	Jack Humbert	2016-08-23	10	-5/+210
\| \|\ \| \| \| \| \| \|	Add native one-handed support
\| \| *	Add one-hand key to planck/experimental keymap.	Joe Wasson	2016-08-20	2	-4/+5
\| \| \|
\| \| *	Add default swap configs for a couple of boards.	Joe Wasson	2016-08-20	3	-0/+45
\| \| \|
\| \| *	Improve one-hand support by adding more actions and tap keys.	Joe Wasson	2016-08-20	3	-9/+89
\| \| \|
\| \| *	Add one-hand support.	Joe Wasson	2016-08-20	5	-1/+80
\| \| \| \| \| \| \| \| \| \| \| \|	This adds an action, `ACTION_SWAP_HANDS`, that swaps the the keys on the keyboard across a keymap-defined hemisphere in order to support one-hand typing without requiring a separate one-handed layer. See updated `doc/keymap.md` for more information.
\| * \|	Merge pull request #673 from coderkun/master	Jack Humbert	2016-08-23	1	-0/+2
\| \|\ \ \| \| \| \| \| \| \| \|	Add method to set Unicode input key for ISO 14755
\| \| * \|	Drop method to set Unicode input key and declare start and finish methods as ↵	coderkun	2016-08-21	2	-13/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	“weak” instead
\| \| * \|	Add method to set Unicode input key for ISO 14755	coderkun	2016-08-21	2	-2/+13
\| \| \|/ \| \| \| \| \| \| \| \| \|	https://github.com/jackhumbert/qmk_firmware/issues/672
\| * \|	Merge pull request #675 from Xyverz/master	Jack Humbert	2016-08-23	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \|	Added missing item K3A to KEYMAP() variable in tv44.h
\| \| * \	Merge remote-tracking branch 'upstream/master'	Xyverz	2016-08-21	44	-2447/+2762
\| \| \|\ \
\| \| * \| \|	Added missing key K3A to KEYMAP() macro in tv44.h	Xyverz	2016-08-21	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge pull request #676 from ickerwx/kitten_paw	Jack Humbert	2016-08-23	9	-0/+611
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|	Added support for the Kitten Paw controller
\| \| * \| \|	Added support for the Kitten Paw controller	René Werner	2016-08-22	9	-0/+611
\| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds support for the 2016 revision of the Kitten Paw [1] replacement controller by Bathroom Epiphanies. [1] http://bathroomepiphanies.com/controllers/
\| * \| \|	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 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
\| \|/ / / / / /
\| \| * \| \| \| \|	smyll typo fixed	Toni	2016-08-18	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	amj60 variant of the readme	Toni	2016-08-18	1	-0/+30
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	first attempt at documentation for the amj60 board	Toni	2016-08-18	1	-0/+57
\| \| \| \| \| \| \|