summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2017-03-08corralled image filesnstickney8-13/+13
2017-03-08SLASH and WHACK functions added (based on algernon's CT_TA)nstickney1-37/+0
2017-03-08SLASH and WHACK functions added (based on algernon's CT_TA)nstickney4-33/+157
2017-03-08Merge remote-tracking branch 'upstream/master'nstickney66-349/+2369
2017-03-04Merge pull request #1107 from qmk/clueboard_cleanupskullydazed31-257/+763
2017-03-03Merge pull request #1126 from folkert4/masterJack Humbert4-70/+95
2017-03-03Merge pull request #1129 from unxmaal/unxmaal_spacefnJack Humbert8-0/+710
2017-03-03Merge pull request #1130 from hot-leaf-juice/masterJack Humbert2-11/+11
2017-03-02moar hotkeysCallum Oakley2-11/+11
2017-03-02gh60 satan spacefnEric Dodd3-0/+160
2017-03-02gh60 spacefnEric Dodd5-0/+550
2017-02-28Various QOL changes:folkert44-70/+95
2017-02-28Merge pull request #1124 from jmdaly/roadkit_firmwareJack Humbert14-0/+499
2017-02-28Merge pull request #1125 from cwhits/upstreamJack Humbert1-8/+8
2017-02-28Update default maps for missing keysChris Helming1-8/+8
2017-02-28Add initial version of TheVan Keyboards Roadkit FirmwareJohn M Daly14-0/+499
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-26making numbers more familiarnstickney1-93/+131
2017-02-25Removes redundant {} which cause build failure when DEBUG_ACTION is setPhong Nguyen1-1/+1
2017-02-25first two layers of ErgoDox Familiar completeCnstickney1-13/+55
2017-02-24initial layer of familiar layout)nstickney1-37/+67
2017-02-24Merge https://github.com/qmk/qmk_firmwarenstickney15-117/+360
2017-02-24familiar layout graphics, etcnstickney7-0/+23475
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-20familiar layout v0.1 from ErgoDox-EZ configuratornstickney1-0/+111
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-16Add the mouse_keys layoutskullY2-0/+11
2017-02-16Rework the clueboard keymaps a bit.skullY30-257/+752
2017-02-16remove more warningsJack Humbert5-17/+39
2017-02-16Merge branch 'master' into promethiumPriyadi Iman Nurcahyo3-1/+3