summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* fixed de_osx prefix in keymap include to avoid conflictsStephan Bösebeck2016-03-31
* added CTL_Shift / Hash macroStephan Bösebeck2016-03-29
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-29
|\
| * Merge pull request #219 from IBNobody/masterJack Humbert2016-03-28
| |\
| | * Minor Tweaks and DocumentationIBNobody2016-03-28
| | * Added command to turn LED indicators off while sleepingIBNobody2016-03-28
| * | Merge pull request #220 from NoahAndrews/improve-buildguideJack Humbert2016-03-28
| |\ \
| | * | Added clarifying steps to Windows section of build guideNoah Andrews2016-03-28
| | * | Merge remote-tracking branch 'jackhumbert/master' into improve-buildguideNoah Andrews2016-03-28
| | |\ \ | | |/ / | |/| |
* | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-28
|\| | |
| * | | Merge pull request #216 from msc654/masterErez Zukerman2016-03-28
| |\ \ \
| | * | | Corrected duplicate image issueMatthew Carroll2016-03-28
| | * | | Added msc keymap for ergodox_ezMatthew Carroll2016-03-27
| * | | | Merge pull request #214 from cdlm/action-hookJack Humbert2016-03-28
| |\ \ \ \
| | * | | | Add action-preprocessing kb/user hooks in planckDamien Pollet2016-03-28
| | * | | | Add action-preprocessing hook to keyboard templateDamien Pollet2016-03-28
| | * | | | Rename function to be keyboard-specificDamien Pollet2016-03-28
| | * | | | Add per-event user hook function to QMKDamien Pollet2016-03-28
| * | | | | Merge pull request #217 from IBNobody/masterJack Humbert2016-03-28
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Magic Key Overrides / Keyboard Lock / Forced NKROIBNobody2016-03-28
| | * | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-03-27
| | |\| | |
| | * | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-03-25
| | |\ \ \ \
| * | \ \ \ \ Merge pull request #218 from awpr/patch-1Jack Humbert2016-03-28
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Add avr-libc to the Debian build dependencies.Andrew Pritchard2016-03-28
| |/ / / / /
| * | | | | Merge pull request #188 from DidierLoiseau/issue-156Erez Zukerman2016-03-27
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Fix #156: clear weak mods on every key pressDidier Loiseau2016-03-08
| * | | | | Merge pull request #211 from nrrkeene/masterErez Zukerman2016-03-27
| |\ \ \ \ \
| | * \ \ \ \ Merge https://github.com/jackhumbert/qmk_firmwareNicholas Keene2016-03-26
| | |\ \ \ \ \
| | * | | | | | The Ordinary Layout is unremarkably mundane and remarkably usefulNicholas Keene2016-03-26
| | * | | | | | The Ordinary Layout is familiar to users of common keyboardsNicholas Keene2016-03-24
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge pull request #196 from naps62/naps62Erez Zukerman2016-03-27
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Adds naps62's layoutMiguel Palhas2016-03-15
| * | | | | | Merge pull request #207 from romanzolotarev/masterErez Zukerman2016-03-25
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Add important note about brightness on OS XRoman Zolotarev2016-03-22
* | | | | | | minor changesStephan Bösebeck2016-03-24
* | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-24
|\| | | | | |
| * | | | | | Merge pull request #210 from n0bs/masterJack Humbert2016-03-23
| |\ \ \ \ \ \
| | * | | | | | Edited to work with jackhumbert/qmk_firmware pull #190Norberto Monarrez2016-03-23
| |/ / / / / /
| * | | | | | Merge pull request #209 from n0bs/masterJack Humbert2016-03-23
| |\ \ \ \ \ \
| | * | | | | | Added files for Bantam-44Norberto Monarrez2016-03-23
| * | | | | | | Merge pull request #200 from alexives/add_diagram_to_planck_layoutJack Humbert2016-03-23
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Added layout diagrams to the default planck keymapAlex Ives2016-03-16
| * | | | | | | Merge pull request #199 from IBNobody/masterJack Humbert2016-03-22
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Fixed extra semicolons.IBNobody2016-03-22
| | * | | | | | Fixed LED Function CallsIBNobody2016-03-22
| | * | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-03-22
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #190 from yoyoerx/function_pointersErez Zukerman2016-03-22
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Pull request 190 resolution with 'qmk/master' for mergeyoyoerx2016-03-21
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | PR190hotfix.sh, fresh hexes, makeallhex.sh scriptyoyoerx2016-03-11
| | * | | | | | | Merge branch 'function_pointers' of github.com:yoyoerx/qmk_keyboard into func...yoyoerx2016-03-10
| | |\ \ \ \ \ \ \