summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master'Manuel Barkhau2016-03-2836-1305/+4815
|\
| * 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
* | | | | | Refactor compiler codeManuel Barkhau2016-03-283-1661/+1900
* | | | | | Add manuneo layoutManuel Barkhau2016-03-273-0/+1918
|/ / / / /
* | | | | 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
|\ \ \ \ \
| * | | | | 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
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #205 from romanzolotarev/masterErez Zukerman2016-03-214-0/+1309
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Update readmeRoman Zolotarev2016-03-191-1/+1
| * | | | | | Update layoutRoman Zolotarev2016-03-1912-192/+67
| * | | | | | Swap volup and voldownRoman Zolotarev2016-03-181-2/+2
| * | | | | | Add Roman's LayoutRoman Zolotarev2016-03-1811-0/+1434
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #203 from XenoBits/masterErez Zukerman2016-03-205-1227/+1174
|\ \ \ \ \ \
| * | | | | | Fixed png imageMaxime Millet2016-03-201-0/+0
| * | | | | | CSharp dev layout V2Maxime Millet2016-03-205-1227/+1174
* | | | | | | Merge pull request #201 from uzytkownik/masterErez Zukerman2016-03-202-1497/+1503
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Add waits to prevent KVM from hangingMaciej Piechotka2016-03-172-1490/+1492
| * | | | | | Put frequently used keys in shell (-=) under thumbMaciej Piechotka2016-03-172-9/+9