summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2017-02-28Merge pull request #1125 from cwhits/upstreamJack Humbert
2017-02-28Update default maps for missing keysChris Helming
2017-02-27Merge pull request #1116 from hot-leaf-juice/masterJack Humbert
2017-02-27Merge pull request #1119 from phongnh/masterJack Humbert
2017-02-27Merge pull request #1121 from Leszek111/masterJack Humbert
2017-02-27Ammend readme.md
2017-02-27Add colemak_programmer
2017-02-25Removes redundant {} which cause build failure when DEBUG_ACTION is setPhong Nguyen
2017-02-23Merge pull request #1118 from priyadi/promethiumJack Humbert
2017-02-23Merge pull request #1117 from priyadi/fix_unicode_mapJack Humbert
2017-02-23Fix UNICODE_MAP input_mode problemPriyadi Iman Nurcahyo
2017-02-23Merge branch 'master' into promethiumPriyadi Iman Nurcahyo
2017-02-23Fix UNICODE_MAP input_mode problemPriyadi Iman Nurcahyo
2017-02-22updated readmeCallum Oakley
2017-02-21Merge pull request #1113 from kesslern/masterJack Humbert
2017-02-21Merge pull request #1115 from Skrymir/masterJack Humbert
2017-02-21Merge remote-tracking branch 'qmk/master'Josh Colbeck
2017-02-21added hotkey clusterCallum Oakley
2017-02-21added pause, prtsc & ins to list of keys to be processed on releasePriyadi Iman Nurcahyo
2017-02-21Move caps to FUN layer; add Pause keyPriyadi Iman Nurcahyo
2017-02-20Add dvorak_emacs_software layout for ergodoxNathan Kessler
2017-02-21Move del back to fun+backspcePriyadi Iman Nurcahyo
2017-02-21Only process Fnumber on key release, and only when layer is still activePriyadi Iman Nurcahyo
2017-02-20Merge pull request #1097 from stanleylai/masterJack Humbert
2017-02-18XD60: Added BL_TOGG back to keymap, with 6 backlight stepsStanley Lai
2017-02-18Updated XD60 readme and photos to reflect v2 PCBStanley Lai
2017-02-16remove more warningsJack Humbert
2017-02-17Merge branch 'master' into promethiumPriyadi Iman Nurcahyo
2017-02-16Fix integer overflowPriyadi Iman Nurcahyo
2017-02-16Merge branch 'master' into promethiumPriyadi Iman Nurcahyo
2017-02-16reposition ins and del keyPriyadi Iman Nurcahyo
2017-02-16fix travis and reduce warningsJack Humbert
2017-02-16ignore PRs in versioningJack Humbert
2017-02-16Merge pull request #1105 from nrrkeene/masterJack Humbert
2017-02-16Merge pull request #1103 from priyadi/promethiumJack Humbert
2017-02-15The Ordinary Layout has all the keys in the right places.Nicholas Keene
2017-02-15This is the best layout, really, come lookNicholas Keene
2017-02-15Merge pull request #1104 from qmk/layer_tap_toggleJack Humbert
2017-02-15The Ordinary Layout is the best one, the one you are looking for. Really. Che...Nicholas Keene
2017-02-15fix weirdness with arm and modsJack Humbert
2017-02-15unique variable nameJack Humbert
2017-02-15publicise variablesJack Humbert
2017-02-15add unicode common file, get names rightJack Humbert
2017-02-15add unicode common file, get names rightJack Humbert
2017-02-15split up unicode systems into different filesJack Humbert
2017-02-15give error if both unicode/map are enabledJack Humbert
2017-02-15adds layer tap toggleJack Humbert
2017-02-15Added README for my keymapPriyadi Iman Nurcahyo
2017-02-15Move keyboard specific stuff to keyboard specific files, and vice versaPriyadi Iman Nurcahyo
2017-02-15Added copyright noticePriyadi Iman Nurcahyo