summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* guni keymapGunther Gruber2017-02-271-0/+176
* Merge pull request #1118 from priyadi/promethiumJack Humbert2017-02-232-26/+33
|\
| * Fix UNICODE_MAP input_mode problemPriyadi Iman Nurcahyo2017-02-231-4/+6
| * Merge branch 'master' into promethiumPriyadi Iman Nurcahyo2017-02-2317-104/+360
| |\
| * | added pause, prtsc & ins to list of keys to be processed on releasePriyadi Iman Nurcahyo2017-02-211-2/+5
| * | Move caps to FUN layer; add Pause keyPriyadi Iman Nurcahyo2017-02-211-12/+4
| * | Move del back to fun+backspcePriyadi Iman Nurcahyo2017-02-211-3/+3
| * | Only process Fnumber on key release, and only when layer is still activePriyadi Iman Nurcahyo2017-02-211-0/+10
| * | Merge branch 'master' into promethiumPriyadi Iman Nurcahyo2017-02-173-1/+3
| |\ \
| * | | Fix integer overflowPriyadi Iman Nurcahyo2017-02-161-6/+4
| * | | Merge branch 'master' into promethiumPriyadi Iman Nurcahyo2017-02-1621-531/+655
| |\ \ \
| * | | | reposition ins and del keyPriyadi Iman Nurcahyo2017-02-162-13/+17
* | | | | Merge pull request #1117 from priyadi/fix_unicode_mapJack Humbert2017-02-231-4/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix UNICODE_MAP input_mode problemPriyadi Iman Nurcahyo2017-02-231-4/+6
| | |_|/ | |/| |
* | | | Merge pull request #1113 from kesslern/masterJack Humbert2017-02-212-0/+240
|\ \ \ \
| * | | | Add dvorak_emacs_software layout for ergodoxNathan Kessler2017-02-202-0/+240
* | | | | Merge pull request #1115 from Skrymir/masterJack Humbert2017-02-211-13/+21
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge remote-tracking branch 'qmk/master'Josh Colbeck2017-02-211360-32215/+115460
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | 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
| * | | | | Merge remote-tracking branch 'refs/remotes/qmk/master'Stanley Lai2017-02-13307-2365/+16213
| |\ \ \ \ \
* | | | | | | remove more warningsJack Humbert2017-02-165-17/+39
| |_|_|/ / / |/| | | | |
* | | | | | fix travis and reduce warningsJack Humbert2017-02-163-1/+3
* | | | | | ignore PRs in versioningJack Humbert2017-02-161-1/+1
| |_|_|_|/ |/| | | |
* | | | | 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
* | | | | | Merge pull request #1103 from priyadi/promethiumJack Humbert2017-02-169-970/+468
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | 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
| |\ \ \ \ \
| * | | | | | Move Alt-Tab positionPriyadi Iman Nurcahyo2017-02-151-4/+4
| * | | | | | Merge branch 'layer_state_set_kb' into promethiumPriyadi Iman Nurcahyo2017-02-151-2/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'layer_state_set_kb' into promethiumPriyadi Iman Nurcahyo2017-02-150-0/+0
| |\ \ \ \ \ \ \
| * | | | | | | | Bug fix & added default_layer_state_set_kbPriyadi Iman Nurcahyo2017-02-152-2/+11
| * | | | | | | | Merge branch 'layer_state_set_kb' into promethiumPriyadi Iman Nurcahyo2017-02-152-0/+8
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 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