avr/qmk/firmware - [no description]

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Major changes include: * The 1HAND layer has been removed. * A `Delete` key is now available on the right thumb cluster. * The ADORE layer received a major update, see the updated layout image. * It is now possible to enable automatic logging for the ADORE layer, by setting the `ADORE_AUTOLOG` makefile variable to `yes` when compiling the keymap. It is off by default. * The `~` key and the `Media Next/Prev` key have been swapped on the base layer. * On the ARROW layer, `Backspace` has been replaced by `Enter`. * There is some experimental support for entering Unicode symbols. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
* \|	Adding my own layouts for the Phantom and Ergodox. My Ergodox layout adds ↵	Ian Sterling	2016-08-09	1	-0/+311
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	persistent layers based on the Planck and Preonic setup. The layout arrays are pulled directly from the ergodox/ez/ez.h keymap definition starting at line 81.
* \|	Delete keymap.c	Xyverz	2016-08-08	1	-184/+0
\| \| \| \| \| \|	file cleanup
* \|	Delete old_keymap.c	Xyverz	2016-08-08	1	-311/+0
\| \| \| \| \| \|	file cleanup
* \|	Delete readme.md	Xyverz	2016-08-08	1	-10/+0
\| \| \| \| \| \|	file cleanup, removing file that doesn't apply to my layout.
* \|	Delete dvorak.png	Xyverz	2016-08-08	1	-0/+0
\| \| \| \| \| \|	Not reflective of my layout.
* \|	Adding my own keymaps to the following keyboards:	Ian Sterling	2016-08-08	4	-0/+505
\|/ \| \| \|	Planck, Preonic, Atreus, Ergodox
*	Merge pull request #592 from sethbc/ez-sethbc	Erez Zukerman	2016-08-02	3	-0/+119
\|\ \| \| \| \|	Ez sethbc
\| *	rebase	Seth Chandler	2016-07-30	3	-0/+119
\| \|
* \|	Merge pull request #593 from J3RN/master	Erez Zukerman	2016-08-02	2	-22/+26
\|\ \ \| \| \| \| \| \|	Updated the J3RN ErgoDox keymap
\| * \|	Updated readme with recent changes	Jonathan Arnett	2016-07-30	1	-3/+6
\| \| \|
\| * \|	Updated my keymap	Jack Humbert	2016-07-30	2	-20/+21
\| \|\\|
* \| \|	Merge pull request #600 from adiabatic/master	Erez Zukerman	2016-08-02	4	-14/+1167
\|\ \ \ \| \| \| \| \| \| \| \|	zweihander-osx: add left-hand-thumb tab key
\| * \| \|	Thumb ⌫ into ⇥, numpad & into :, yank home/end	Nathan Sharfi	2016-07-31	3	-13/+1166
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also: add (back?) in the light-shine disabler
\| * \| \|	Merge branch 'master' of github.com:jackhumbert/qmk_firmware	Nathan Sharfi	2016-07-31	1	-1/+1
\| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c # keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex
* / \|	Generate version information to version.h	Fred Sundvik	2016-07-31	3	-0/+3
\|/ / \| \| \| \| \| \|	So that only the files that really needs a version are recompiled.
* /	Update some obsolete references	Gergely Nagy	2016-07-30	1	-1/+1
\|/ \| \| \| \| \| \| \| \| \| \|	Some links were still pointing to `/keyboards/ergodox_ez`, while the directory is `/keyboards/erdogox` now. Not all references have been updated, and some of the text here and there may need updating to mention the ErgoDox Infinity too, but that's out of the scope for this quick fix. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
*	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
\| \| \| \|	Also fixup the include path of parent config
*	Change _delay_ms to wait_ms in algernon keymap	Fred Sundvik	2016-07-29	1	-1216/+1217
\|
*	All Ez keymaps compiles	Fred Sundvik	2016-07-29	57	-58/+58
\|
*	Initial structure for Ergodox as subprojects	Fred Sundvik	2016-07-29	178	-0/+21911
	Only the EZ default keymaps compiles at the moment though.