qmk_firmware - [no description]

	Commit message (Expand)	Author	Age	Files	Lines
*	fixed de_osx prefix in keymap include to avoid conflicts	Stephan Bösebeck	2016-03-31	1	-25/+25
*	added CTL_Shift / Hash macro	Stephan Bösebeck	2016-03-29	1	-11/+24
*	Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware	Stephan Bösebeck	2016-03-28	24	-1176/+4336
\|\
\| *	Merge pull request #216 from msc654/master	Erez Zukerman	2016-03-28	6	-0/+1334
\| \|\
\| \| *	Corrected duplicate image issue	Matthew Carroll	2016-03-28	1	-0/+0
\| \| *	Added msc keymap for ergodox_ez	Matthew Carroll	2016-03-27	6	-0/+1334
\| * \|	Merge pull request #214 from cdlm/action-hook	Jack Humbert	2016-03-28	2	-15/+18
\| \|\ \
\| \| * \|	Add action-preprocessing kb/user hooks in planck	Damien Pollet	2016-03-28	2	-15/+18
\| \| \|/
\| * /	Magic Key Overrides / Keyboard Lock / Forced NKRO	IBNobody	2016-03-28	2	-13/+57
\| \|/
\| *	Merge pull request #211 from nrrkeene/master	Erez Zukerman	2016-03-27	10	-1147/+1232
\| \|\
\| \| *	Merge https://github.com/jackhumbert/qmk_firmware	Nicholas Keene	2016-03-26	1	-1/+5
\| \| \|\
\| \| * \|	The Ordinary Layout is unremarkably mundane and remarkably useful	Nicholas Keene	2016-03-26	10	-1109/+1192
\| \| * \|	The Ordinary Layout is familiar to users of common keyboards	Nicholas Keene	2016-03-24	1	-58/+60
\| * \| \|	Merge pull request #196 from naps62/naps62	Erez Zukerman	2016-03-27	3	-0/+1690
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|
\| \| * \|	Adds naps62's layout	Miguel Palhas	2016-03-15	3	-0/+1690
\| * \| \|	Merge pull request #207 from romanzolotarev/master	Erez Zukerman	2016-03-25	1	-1/+5
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|
\| \| * \|	Add important note about brightness on OS X	Roman Zolotarev	2016-03-22	1	-1/+5
* \| \| \|	minor changes	Stephan Bösebeck	2016-03-24	2	-1113/+1111
* \| \| \|	Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware	Stephan Bösebeck	2016-03-24	91	-41409/+33727
\|\\| \| \|
\| * \| \|	Edited to work with jackhumbert/qmk_firmware pull #190	Norberto Monarrez	2016-03-23	2	-16/+12
\| * \| \|	Merge pull request #209 from n0bs/master	Jack Humbert	2016-03-23	6	-0/+332
\| \|\ \ \
\| \| * \| \|	Added files for Bantam-44	Norberto Monarrez	2016-03-23	6	-0/+332
\| * \| \| \|	Merge pull request #200 from alexives/add_diagram_to_planck_layout	Jack Humbert	2016-03-23	1	-5/+65
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| \| * \| \|	Added layout diagrams to the default planck keymap	Alex Ives	2016-03-16	1	-5/+65
\| * \| \| \|	Fixed LED Function Calls	IBNobody	2016-03-22	2	-24/+12
\| * \| \| \|	Merge remote-tracking branch 'refs/remotes/jackhumbert/master'	IBNobody	2016-03-22	84	-41564/+34408
\| \|\ \ \ \
\| \| * \ \ \	Pull request 190 resolution with 'qmk/master' for merge	yoyoerx	2016-03-21	13	-2577/+4004
\| \| \|\ \ \ \
\| \| * \| \| \| \|	PR190hotfix.sh, fresh hexes, makeallhex.sh script	yoyoerx	2016-03-11	33	-41292/+32894
\| \| * \| \| \| \|	Addressed void* return warning in all keymaps	yoyoerx	2016-03-10	44	-149/+128
\| * \| \| \| \| \|	Adding Retro_Refit Keyboard	IBNobody	2016-03-16	6	-0/+400
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware	Stephan Bösebeck	2016-03-22	4	-0/+1309
\|\ \ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge pull request #205 from romanzolotarev/master	Erez Zukerman	2016-03-21	4	-0/+1309
\| \|\ \ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \|
\| \| * \| \| \|	Update readme	Roman Zolotarev	2016-03-19	1	-1/+1
\| \| * \| \| \|	Update layout	Roman Zolotarev	2016-03-19	12	-192/+67
\| \| * \| \| \|	Swap volup and voldown	Roman Zolotarev	2016-03-18	1	-2/+2
\| \| * \| \| \|	Add Roman's Layout	Roman Zolotarev	2016-03-18	11	-0/+1434
\| \| \|/ / /
* \| \| \| \|	fix number pad, add ,	Stephan Bösebeck	2016-03-20	1	-1/+1
* \| \| \| \|	changing cursor keys, back to "default" cursor key layout, adding ISO-cursor ...	Stephan Bösebeck	2016-03-20	1	-4/+4
* \| \| \| \|	tweaking it a bit further, fixing things	Stephan Bösebeck	2016-03-20	1	-12/+12
* \| \| \| \|	Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware	Stephan Bösebeck	2016-03-20	9	-2961/+3078
\|\\| \| \| \|
\| * \| \| \|	Merge pull request #203 from XenoBits/master	Erez Zukerman	2016-03-20	5	-1227/+1174
\| \|\ \ \ \
\| \| * \| \| \|	Fixed png image	Maxime Millet	2016-03-20	1	-0/+0
\| \| * \| \| \|	CSharp dev layout V2	Maxime Millet	2016-03-20	5	-1227/+1174
\| * \| \| \| \|	Add waits to prevent KVM from hanging	Maciej Piechotka	2016-03-17	2	-1490/+1492
\| * \| \| \| \|	Put frequently used keys in shell (-=) under thumb	Maciej Piechotka	2016-03-17	2	-9/+9
\| * \| \| \| \|	Add missing breaks in mpiechotka ergodox_ez keyboard	Maciej Piechotka	2016-03-17	2	-1233/+1237
\| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	Cygwin Based Users Guide v0.6 -fixes to dfu-programmer build	yoyoerx	2016-03-14	1	-6/+8
\| \| \|_\|/ \| \|/\| \|
\| * \| \|	First keyboard layout	Mitch Lloyd	2016-03-10	1	-0/+49
\| * \| \|	Merge remote-tracking branch 'qmk/master' into windocs	yoyoerx	2016-03-10	1	-27/+24
\| \|\ \ \
\| * \| \| \|	Cygwin Based Users Guide v0.5 -further corrections	yoyoerx	2016-03-09	1	-347/+353
\| \|/ / /