summaryrefslogtreecommitdiffstats
path: root/keyboards
AgeCommit message (Expand)AuthorFilesLines
2016-11-26separated into api files/folderJack Humbert5-25/+4
2016-11-24rgblight fixesJack Humbert2-5/+7
2016-11-24travis plsJack Humbert2-2/+4
2016-11-22Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7Jack Humbert21-30/+1217
2016-11-22fix infinityJack Humbert2-2/+2
2016-11-22Merge pull request #894 from dchagniot/ergodoxDvorakEmacsJack Humbert2-0/+235
2016-11-22Merge pull request #893 from Sihui/sh-hhkb-jpJack Humbert3-0/+147
2016-11-22Merge pull request #892 from fredizzimo/disable_ergodox_lcdJack Humbert2-26/+5
2016-11-22Merge pull request #891 from g-sam/galson-keymapJack Humbert3-0/+196
2016-11-22Merge pull request #888 from climbalima/masterJack Humbert3-4/+12
2016-11-22Merge pull request #887 from profet23/atreus62Jack Humbert8-0/+622
2016-11-22merging lets_splitJack Humbert50-319/+2097
2016-11-22working with helper, qmk_helper_windows@05b0105Jack Humbert2-6/+6
2016-11-20add del to new cmdSihui Huang1-1/+1
2016-11-20add space to NewCmd layerSihui Huang1-1/+1
2016-11-20add space to NewCmd layerSihui Huang2-2/+2
2016-11-20typo fixDidier Chagniot2-19/+19
2016-11-20Update README.mdSihui Huang1-1/+1
2016-11-20Update README.mdSihui Huang1-1/+2
2016-11-20Update README.mdSihui Huang1-1/+2
2016-11-20add sh-hhkb-jp layersSihui Huang3-0/+145
2016-11-20Always initialze the Infinity Ergodox backlightFred Sundvik2-26/+5
2016-11-19remove KC expansion from GH60Seth Chandler4-99/+55
2016-11-19move KC expansion to separate macrosSeth Chandler4-23/+66
2016-11-19merge upstream/masterSeth Chandler45-252/+1949
2016-11-19adds galson keymapsamgalson@gmail.com3-0/+196
2016-11-19changed readmeclimbalima2-2/+3
2016-11-19added the pinout for pro micro into maxipadclimbalima2-3/+10
2016-11-19wqMerge branch 'wu5y7' of https://github.com/jackhumbert/qmk_firmware into wu5y7Jack Humbert3-7/+42
2016-11-19midi back and forthJack Humbert1-1/+6
2016-11-18Groundwork for dedicated color keycodesErez Zukerman1-1/+23
2016-11-18Initial Erez Experimental keymap tweaksErez Zukerman3-6/+19
2016-11-17rgb light through midiJack Humbert21-21/+22
2016-11-17Adding readme placeholderBenjamin Grabkowitz1-0/+10
2016-11-17Adding Support for atreus62 keyboard. https://github.com/profet23/atreus62Benjamin Grabkowitz7-0/+612
2016-11-17fixed readme conflictsclimbalima1-20/+2
2016-11-17should have fixed conflixedclimbalima13-268/+10
2016-11-17Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareclimbalima20-123/+1189
2016-11-17Merge https://github.com/climbalima/qmk_firmwareclimbalima14-29/+278
2016-11-17Updated my repo to current qmkclimbalima25-98/+756
2016-11-16dvorak/plover keyboard layoutSeebs2-0/+244
2016-11-16Merge pull request #880 from psyill/masterJack Humbert6-0/+678
2016-11-16Merge pull request #879 from sethbc/update_sethbc_ergodox_keymapJack Humbert3-13/+3
2016-11-16Merge pull request #877 from sethbc/update_sethbc_satan_keymapJack Humbert1-7/+7
2016-11-16Merge pull request #876 from Dbroqua/masterJack Humbert3-1/+120
2016-11-16Merge pull request #866 from fredizzimo/infinity60_clockfixesJack Humbert2-2/+7
2016-11-15fixed conflictclimbalima1-3/+0
2016-11-15fixed extra pasteclimbalima1-3/+2
2016-11-14mostly workingJack Humbert4-4/+13
2016-11-13Added keymap "videck", an ErgoDox keymap for Vi(m) users.Hans EllegÄrd6-0/+678