summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-03-3088-2073/+4937
|\
| * Merge pull request #229 from NoahAndrews/patch-5Jack Humbert2016-03-301-2/+2
| |\
| | * Update README.mdNoah Andrews2016-03-301-2/+2
| |/
| * Merge pull request #227 from NoahAndrews/patch-4Jack Humbert2016-03-301-2/+2
| |\
| | * Fixed minor issues with Preonic readmeNoah Andrews2016-03-301-2/+2
| * | Merge pull request #228 from mrfoto/fix-planck-diagramJack Humbert2016-03-301-2/+2
| |\ \ | | |/ | |/|
| | * Tiny fix of Planck diagramsMiha Rekar2016-03-301-2/+2
| |/
| * preonic readmeJack Humbert2016-03-301-9/+3
| * Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboardJack Humbert2016-03-30179-41877/+39434
| |\
| | * Merge pull request #224 from NoahAndrews/make-keymap-names-consistentJack Humbert2016-03-2941-42/+45
| | |\
| | | * Updated several keyboard folders to use new keymap naming schemeNoah Andrews2016-03-2941-42/+45
| | | * Merge remote-tracking branch 'jackhumbert/master' into make-keymap-names-cons...Noah Andrews2016-03-29147-40692/+40208
| | | |\ | | | |/ | | |/|
| | * | Merge pull request #223 from NoahAndrews/patch-3Jack Humbert2016-03-291-4/+9
| | |\ \
| | | * | Fix #198Noah Andrews2016-03-291-4/+9
| | |/ /
| | * | Merge pull request #222 from NoahAndrews/patch-2Jack Humbert2016-03-291-1/+1
| | |\ \
| | | * | Fix error in Planck makefile commentNoah Andrews2016-03-291-1/+1
| | |/ /
| | * | Merge pull request #219 from IBNobody/masterJack Humbert2016-03-284-13/+48
| | |\ \
| | | * | Minor Tweaks and DocumentationIBNobody2016-03-283-12/+44
| | | * | Added command to turn LED indicators off while sleepingIBNobody2016-03-281-1/+4
| | * | | Merge pull request #220 from NoahAndrews/improve-buildguideJack Humbert2016-03-281-5/+7
| | |\ \ \
| | | * | | Added clarifying steps to Windows section of build guideNoah Andrews2016-03-281-5/+7
| | | * | | Merge remote-tracking branch 'jackhumbert/master' into improve-buildguideNoah Andrews2016-03-28144-40683/+40157
| | | |\ \ \ | | | |/ / / | | |/| | / | | | | |/ | | | |/|
| | * | | Merge pull request #216 from msc654/masterErez Zukerman2016-03-286-0/+1334
| | |\ \ \
| | | * | | Corrected duplicate image issueMatthew Carroll2016-03-281-0/+0
| | | * | | Added msc keymap for ergodox_ezMatthew Carroll2016-03-276-0/+1334
| | * | | | Merge pull request #214 from cdlm/action-hookJack Humbert2016-03-286-21/+45
| | |\ \ \ \
| | | * | | | Add action-preprocessing kb/user hooks in planckDamien Pollet2016-03-282-15/+18
| | | * | | | Add action-preprocessing hook to keyboard templateDamien Pollet2016-03-282-6/+19
| | | * | | | Rename function to be keyboard-specificDamien Pollet2016-03-282-4/+4
| | | * | | | Add per-event user hook function to QMKDamien Pollet2016-03-282-0/+8
| | * | | | | Merge pull request #217 from IBNobody/masterJack Humbert2016-03-287-132/+488
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Magic Key Overrides / Keyboard Lock / Forced NKROIBNobody2016-03-287-132/+488
| | | * | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-03-2718-1150/+2950
| | | |\| | |
| | | * | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-03-257-5/+393
| | | |\ \ \ \
| | * | \ \ \ \ Merge pull request #218 from awpr/patch-1Jack Humbert2016-03-281-3/+3
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | Add avr-libc to the Debian build dependencies.Andrew Pritchard2016-03-281-3/+3
| | |/ / / / /
| * | | | | | .hex filesJack Humbert2016-03-303-2/+2893
| * | | | | | preonic updateJack Humbert2016-03-3020-1846/+66
* | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-03-2836-1161/+3763
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #188 from DidierLoiseau/issue-156Erez Zukerman2016-03-274-2/+23
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Fix #156: clear weak mods on every key pressDidier Loiseau2016-03-084-2/+23
| * | | | | | Merge pull request #211 from nrrkeene/masterErez Zukerman2016-03-2710-1147/+1232
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge https://github.com/jackhumbert/qmk_firmwareNicholas Keene2016-03-261-1/+5
| | |\ \ \ \ \ \
| | * | | | | | | The Ordinary Layout is unremarkably mundane and remarkably usefulNicholas Keene2016-03-2610-1109/+1192
| | * | | | | | | The Ordinary Layout is familiar to users of common keyboardsNicholas Keene2016-03-241-58/+60
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge pull request #196 from naps62/naps62Erez Zukerman2016-03-273-0/+1690
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Adds naps62's layoutMiguel Palhas2016-03-153-0/+1690
| * | | | | | | Merge pull request #207 from romanzolotarev/masterErez Zukerman2016-03-251-1/+5
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Add important note about brightness on OS XRoman Zolotarev2016-03-221-1/+5
| * | | | | | | Merge pull request #210 from n0bs/masterJack Humbert2016-03-232-16/+12
| |\ \ \ \ \ \ \