summaryrefslogtreecommitdiffstats
path: root/keyboard
AgeCommit message (Expand)AuthorFilesLines
2016-04-01minor tweaks at the keymap, new png for documentationStephan Bösebeck2-6/+6
2016-03-31fixed de_osx prefix in keymap include to avoid conflictsStephan Bösebeck1-25/+25
2016-03-29added CTL_Shift / Hash macroStephan Bösebeck1-11/+24
2016-03-28Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck24-1176/+4336
2016-03-28Merge pull request #216 from msc654/masterErez Zukerman6-0/+1334
2016-03-28Merge pull request #214 from cdlm/action-hookJack Humbert2-15/+18
2016-03-28Add action-preprocessing kb/user hooks in planckDamien Pollet2-15/+18
2016-03-28Corrected duplicate image issueMatthew Carroll1-0/+0
2016-03-28Magic Key Overrides / Keyboard Lock / Forced NKROIBNobody2-13/+57
2016-03-28Added msc keymap for ergodox_ezMatthew Carroll6-0/+1334
2016-03-27Merge pull request #211 from nrrkeene/masterErez Zukerman10-1147/+1232
2016-03-27Merge pull request #196 from naps62/naps62Erez Zukerman3-0/+1690
2016-03-26Merge https://github.com/jackhumbert/qmk_firmwareNicholas Keene1-1/+5
2016-03-26The Ordinary Layout is unremarkably mundane and remarkably usefulNicholas Keene10-1109/+1192
2016-03-25Merge pull request #207 from romanzolotarev/masterErez Zukerman1-1/+5
2016-03-25The Ordinary Layout is familiar to users of common keyboardsNicholas Keene1-58/+60
2016-03-24minor changesStephan Bösebeck2-1113/+1111
2016-03-24Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck91-41409/+33727
2016-03-23Edited to work with jackhumbert/qmk_firmware pull #190Norberto Monarrez2-16/+12
2016-03-23Merge pull request #209 from n0bs/masterJack Humbert6-0/+332
2016-03-23Merge pull request #200 from alexives/add_diagram_to_planck_layoutJack Humbert1-5/+65
2016-03-23Added files for Bantam-44Norberto Monarrez6-0/+332
2016-03-23Fixed LED Function CallsIBNobody2-24/+12
2016-03-23Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody84-41564/+34408
2016-03-22Add important note about brightness on OS XRoman Zolotarev1-1/+5
2016-03-22Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck4-0/+1309
2016-03-21Pull request 190 resolution with 'qmk/master' for mergeyoyoerx13-2577/+4004
2016-03-21Merge pull request #205 from romanzolotarev/masterErez Zukerman4-0/+1309
2016-03-20fix number pad, add ,Stephan Bösebeck1-1/+1
2016-03-20changing cursor keys, back to "default" cursor key layout, adding ISO-cursor ...Stephan Bösebeck1-4/+4
2016-03-20tweaking it a bit further, fixing thingsStephan Bösebeck1-12/+12
2016-03-20Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck9-2961/+3078
2016-03-20Merge pull request #203 from XenoBits/masterErez Zukerman5-1227/+1174
2016-03-20Fixed png imageMaxime Millet1-0/+0
2016-03-20CSharp dev layout V2Maxime Millet5-1227/+1174
2016-03-19Update readmeRoman Zolotarev1-1/+1
2016-03-19Update layoutRoman Zolotarev12-192/+67
2016-03-18Swap volup and voldownRoman Zolotarev1-2/+2
2016-03-18Add Roman's LayoutRoman Zolotarev11-0/+1434
2016-03-17Add waits to prevent KVM from hangingMaciej Piechotka2-1490/+1492
2016-03-17Put frequently used keys in shell (-=) under thumbMaciej Piechotka2-9/+9
2016-03-17Add missing breaks in mpiechotka ergodox_ez keyboardMaciej Piechotka2-1233/+1237
2016-03-17Added layout diagrams to the default planck keymapAlex Ives1-5/+65
2016-03-16Adding Retro_Refit KeyboardIBNobody6-0/+400
2016-03-15Adds naps62's layoutMiguel Palhas3-0/+1690
2016-03-14Cygwin Based Users Guide v0.6 -fixes to dfu-programmer buildyoyoerx1-6/+8
2016-03-11PR190hotfix.sh, fresh hexes, makeallhex.sh scriptyoyoerx33-41292/+32894
2016-03-11First keyboard layoutMitch Lloyd1-0/+49
2016-03-10Addressed void* return warning in all keymapsyoyoerx44-149/+128
2016-03-10Merge remote-tracking branch 'qmk/master' into windocsyoyoerx1-27/+24