summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2017-02-28Merge pull request #1116 from hot-leaf-juice/masterJack Humbert2-12/+12
2017-02-28Merge pull request #1119 from phongnh/masterJack Humbert1-1/+1
2017-02-28Merge pull request #1121 from Leszek111/masterJack Humbert5-0/+280
2017-02-27Ammend readme.md1-2/+4
2017-02-27Add colemak_programmer5-0/+278
2017-02-25Removes redundant {} which cause build failure when DEBUG_ACTION is setPhong Nguyen1-1/+1
2017-02-23Merge pull request #1118 from priyadi/promethiumJack Humbert2-26/+33
2017-02-23Merge pull request #1117 from priyadi/fix_unicode_mapJack Humbert1-4/+6
2017-02-23Fix UNICODE_MAP input_mode problemPriyadi Iman Nurcahyo1-4/+6
2017-02-23Merge branch 'master' into promethiumPriyadi Iman Nurcahyo17-104/+360
2017-02-23Fix UNICODE_MAP input_mode problemPriyadi Iman Nurcahyo1-4/+6
2017-02-22updated readmeCallum Oakley1-5/+5
2017-02-22Merge pull request #1113 from kesslern/masterJack Humbert2-0/+240
2017-02-22Merge pull request #1115 from Skrymir/masterJack Humbert1-13/+21
2017-02-22Merge remote-tracking branch 'qmk/master'Josh Colbeck1267-17197/+100442
2017-02-22added hotkey clusterCallum Oakley1-7/+7
2017-02-21added pause, prtsc & ins to list of keys to be processed on releasePriyadi Iman Nurcahyo1-2/+5
2017-02-21Move caps to FUN layer; add Pause keyPriyadi Iman Nurcahyo1-12/+4
2017-02-21Add dvorak_emacs_software layout for ergodoxNathan Kessler2-0/+240
2017-02-20Move del back to fun+backspcePriyadi Iman Nurcahyo1-3/+3
2017-02-20Only process Fnumber on key release, and only when layer is still activePriyadi Iman Nurcahyo1-0/+10
2017-02-20Merge pull request #1097 from stanleylai/masterJack Humbert9-74/+60
2017-02-19XD60: Added BL_TOGG back to keymap, with 6 backlight stepsStanley Lai2-7/+4
2017-02-19Updated XD60 readme and photos to reflect v2 PCBStanley Lai4-2/+6
2017-02-16remove more warningsJack Humbert5-17/+39
2017-02-16Merge branch 'master' into promethiumPriyadi Iman Nurcahyo3-1/+3
2017-02-16Fix integer overflowPriyadi Iman Nurcahyo1-6/+4
2017-02-16Merge branch 'master' into promethiumPriyadi Iman Nurcahyo21-531/+655
2017-02-16reposition ins and del keyPriyadi Iman Nurcahyo2-13/+17
2017-02-16fix travis and reduce warningsJack Humbert3-1/+3
2017-02-16ignore PRs in versioningJack Humbert1-1/+1
2017-02-16Merge pull request #1105 from nrrkeene/masterJack Humbert8-80/+165
2017-02-16Merge pull request #1103 from priyadi/promethiumJack Humbert9-970/+468
2017-02-16The Ordinary Layout has all the keys in the right places.Nicholas Keene1-1/+1
2017-02-16This is the best layout, really, come lookNicholas Keene1-4/+4
2017-02-16Merge pull request #1104 from qmk/layer_tap_toggleJack Humbert13-451/+490
2017-02-16The Ordinary Layout is the best one, the one you are looking for. Really. Che...Nicholas Keene4-29/+43
2017-02-16fix weirdness with arm and modsJack Humbert2-19/+20
2017-02-16unique variable nameJack Humbert2-19/+19
2017-02-15publicise variablesJack Humbert2-4/+3
2017-02-15add unicode common file, get names rightJack Humbert1-0/+86
2017-02-15add unicode common file, get names rightJack Humbert7-209/+137
2017-02-15split up unicode systems into different filesJack Humbert9-239/+253
2017-02-15give error if both unicode/map are enabledJack Humbert1-0/+3
2017-02-15adds layer tap toggleJack Humbert2-4/+12
2017-02-15Added README for my keymapPriyadi Iman Nurcahyo2-0/+44
2017-02-15Move keyboard specific stuff to keyboard specific files, and vice versaPriyadi Iman Nurcahyo5-116/+168
2017-02-15Added copyright noticePriyadi Iman Nurcahyo1-2/+14
2017-02-15Merge my Planck-like keyboardsPriyadi Iman Nurcahyo4-976/+144
2017-02-15Merge branch 'master' into promethiumPriyadi Iman Nurcahyo3-16/+60