aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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
| | * | | | 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
| |/ / / / /
| * | | | | 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
* | | | | | | minor changesStephan Bösebeck2016-03-242-1113/+1111
* | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-2498-41441/+33775
|\| | | | | |
| * | | | | | Merge pull request #210 from n0bs/masterJack Humbert2016-03-232-16/+12
| |\ \ \ \ \ \
| | * | | | | | Edited to work with jackhumbert/qmk_firmware pull #190Norberto Monarrez2016-03-232-16/+12
| |/ / / / / /
| * | | | | | Merge pull request #209 from n0bs/masterJack Humbert2016-03-236-0/+332
| |\ \ \ \ \ \
| | * | | | | | Added files for Bantam-44Norberto Monarrez2016-03-236-0/+332
| * | | | | | | Merge pull request #200 from alexives/add_diagram_to_planck_layoutJack Humbert2016-03-231-5/+65
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Added layout diagrams to the default planck keymapAlex Ives2016-03-161-5/+65
| * | | | | | | Merge pull request #199 from IBNobody/masterJack Humbert2016-03-2211-6/+420
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Fixed extra semicolons.IBNobody2016-03-222-9/+6
| | * | | | | | Fixed LED Function CallsIBNobody2016-03-224-34/+22
| | * | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-03-2288-41597/+34428
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #190 from yoyoerx/function_pointersErez Zukerman2016-03-2282-41462/+33034
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Pull request 190 resolution with 'qmk/master' for mergeyoyoerx2016-03-2115-2579/+4317
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | PR190hotfix.sh, fresh hexes, makeallhex.sh scriptyoyoerx2016-03-1133-41292/+32894
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 19:29:08 +0000