summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #234 from sboesebeck/masterErez Zukerman2016-04-034-1330/+1349
|\
| * Merge branch 'master' of https://github.com/sboesebeck/qmk_firmwareStephan Bösebeck2016-04-0284-2017/+4991
| |\
| | * Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-04-0181-1909/+4883
| | |\ | |_|/ |/| |
* | | Merge pull request #233 from tak3over/patch-1Jack Humbert2016-04-011-0/+136
|\ \ \
| * | | Create tak3over.ctak3over2016-04-011-0/+136
|/ / /
* | | adding files is always smartJack Humbert2016-04-017-0/+327
* | | Merge pull request #226 from squisher/dvorak_intl_squisherErez Zukerman2016-04-016-0/+1341
|\ \ \
| * | | Also add compiled hex fileDavid Mohr2016-03-301-0/+1127
| * | | Squisher's international dvorak variant for ergodox ezDavid Mohr2016-03-305-0/+214
* | | | Merge pull request #230 from IBNobody/masterJack Humbert2016-03-311-11/+68
|\ \ \ \ | |/ / / |/| | |
| * | | Drastically rewrote the path script to handle Explorer's stubborn grasp of En...IBNobody2016-03-301-11/+68
|/ / /
* | | 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
| |/ / / /
* | | | | .hex filesJack Humbert2016-03-303-2/+2893
* | | | | preonic updateJack Humbert2016-03-3020-1846/+66
| | | | * minor tweaks at the keymap, new png for documentationStephan Bösebeck2016-04-012-6/+6
| | | | * fixed de_osx prefix in keymap include to avoid conflictsStephan Bösebeck2016-03-312-103/+103
| | | * | new keymapStephan Bösebeck2016-04-021-1/+9
| | | |/
| | | * added CTL_Shift / Hash macroStephan Bösebeck2016-03-291-11/+24
| | | * Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-295-18/+55
| | | |\ | | |_|/ | |/| |
| * | | 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 branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-2837-1306/+4820
| | | | |\ | | |_|_|/ | |/| | |
| * | | | 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