summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'qmk/master'Josh Colbeck2017-02-211154-22686/+99796
|\
| * Merge pull request #1097 from stanleylai/masterJack Humbert2017-02-209-74/+60
| |\
| | * XD60: Added BL_TOGG back to keymap, with 6 backlight stepsStanley Lai2017-02-182-7/+4
| | * Updated XD60 readme and photos to reflect v2 PCBStanley Lai2017-02-184-2/+6
| | * Added support for XD60v2 with RGB underglow and LED backlight supportStanley Lai2017-02-135-72/+57
| * | remove more warningsJack Humbert2017-02-164-16/+36
| * | Merge pull request #1105 from nrrkeene/masterJack Humbert2017-02-168-80/+165
| |\ \
| | * | The Ordinary Layout has all the keys in the right places.Nicholas Keene2017-02-151-1/+1
| | * | This is the best layout, really, come lookNicholas Keene2017-02-151-4/+4
| | * | The Ordinary Layout is the best one, the one you are looking for. Really. Che...Nicholas Keene2017-02-154-29/+43
| | * | The Ordinary Layout is boring, normal, typical, expected.Nicholas Keene2017-02-142-54/+125
| | * | The Ordinary Layout has a feature for one-handed chorded typingNicholas Keene2017-02-142-3/+3
| | * | All my friends us The Ordinary Layout because it doesn't force you to change ...Nicholas Keene2017-02-142-4/+4
| | * | The Ordinary Layout now has more symbols on the Symbols layer! So useful!Nicholas Keene2017-02-142-11/+11
| * | | Added README for my keymapPriyadi Iman Nurcahyo2017-02-152-0/+44
| * | | Move keyboard specific stuff to keyboard specific files, and vice versaPriyadi Iman Nurcahyo2017-02-155-116/+168
| * | | Added copyright noticePriyadi Iman Nurcahyo2017-02-151-2/+14
| * | | Merge my Planck-like keyboardsPriyadi Iman Nurcahyo2017-02-154-976/+144
| * | | Merge branch 'master' into promethiumPriyadi Iman Nurcahyo2017-02-153-16/+60
| |\ \ \ | | | |/ | | |/|
| | * | Merge pull request #1094 from priyadi/faux_clickyJack Humbert2017-02-132-3/+4
| | |\ \
| | * | | define missing KC_NO macroMarvin Ramin2017-02-131-6/+7
| | * | | adds documentation for reset button and adds one to the default keymapMarvin Ramin2017-02-133-15/+58
| * | | | Move Alt-Tab positionPriyadi Iman Nurcahyo2017-02-151-4/+4
| * | | | num, func, punc 3state layer done rightPriyadi Iman Nurcahyo2017-02-152-57/+46
| * | | | GUI layer fixesPriyadi Iman Nurcahyo2017-02-142-4/+4
| * | | | Alt-tab handling in GUI layerPriyadi Iman Nurcahyo2017-02-142-5/+25
| * | | | remove stand alone punc layer switcher for nowPriyadi Iman Nurcahyo2017-02-142-3/+4
| * | | | Add explicit punctuation key for greek layersPriyadi Iman Nurcahyo2017-02-142-12/+12
| * | | | Func + Num = PuncPriyadi Iman Nurcahyo2017-02-142-17/+17
| * | | | move GRV to ESC positionPriyadi Iman Nurcahyo2017-02-132-8/+9
| * | | | Fix faux clicky toggle keyPriyadi Iman Nurcahyo2017-02-131-3/+7
| * | | | Merge branch 'faux_clicky' into promethiumPriyadi Iman Nurcahyo2017-02-132-1/+6
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Implement faux-clicky featurePriyadi Iman Nurcahyo2017-02-132-3/+4
| * | | | Update my Planck layoutPriyadi Iman Nurcahyo2017-02-131-151/+365
| * | | | Forgot to add ifdef to optional featurePriyadi Iman Nurcahyo2017-02-131-0/+2
| * | | | Remove assignment warningPriyadi Iman Nurcahyo2017-02-131-1/+1
| * | | | Workaround to remove warningPriyadi Iman Nurcahyo2017-02-132-1/+2
| * | | | Some space optimization and housekeepingPriyadi Iman Nurcahyo2017-02-131-44/+30
| | |/ / | |/| |
| * | | adds planck/rev3 makefile so subproject is foundJack Humbert2017-02-121-0/+3
| * | | updated readmeluc wastiaux2017-02-131-1/+1
| * | | Merge remote-tracking branch 'upstream/master'luc wastiaux2017-02-13117-707/+5585
| |\ \ \
| | * \ \ Merge pull request #1091 from smt/smt/tv44Jack Humbert2017-02-125-0/+415
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Add smt keymap for tv44 (MiniVan)Stephen Tudor2017-02-125-0/+415
| | * | | Merge pull request #1065 from milestogo/masterJack Humbert2017-02-112-78/+131
| | |\ \ \
| | | * \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwaremilestogo2017-02-0497-695/+6080
| | | |\ \ \
| | | * | | | fixing kinesis rebootmilestogo2017-01-301-2/+2
| | | * | | | split kinesis layout into ergodox and planck style symbol layersmilestogo2017-01-271-76/+129
| | * | | | | Merge pull request #1085 from priyadi/promethiumJack Humbert2017-02-118-293/+780
| | |\ \ \ \ \
| | | * | | | | Add regular space to B+N on GUI layer for repeating spacePriyadi Iman Nurcahyo2017-02-111-1/+1
| | | * | | | | Switch to Emoji layer using Punc + greekPriyadi Iman Nurcahyo2017-02-111-20/+4