summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-11-25Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne
2016-11-25Merge pull request #902 from OferPlesser/feature/ps2-mouse-supportJack Humbert
2016-11-25Added documentation for PS/2 mouse in readmeofples
2016-11-25Removed commentofples
2016-11-25Added missing endif for ifdef __AVR_ATmega32U4__ and removed the unnecessary ...ofples
2016-11-25Added protocol.mk to buildofples
2016-11-24Merge pull request #899 from Wilba6582/suspend_fixJack Humbert
2016-11-23rgblight fixesJack Humbert
2016-11-23travis plsJack Humbert
2016-11-23converted to new formatJack Humbert
2016-11-23Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne
2016-11-23Fixed NO_SUSPEND_POWER_DOWN handlingWilba6582
2016-11-23converted to 8bit messagesJack Humbert
2016-11-23Fixed NO_SUSPEND_POWER_DOWN handlingWilba6582
2016-11-22Merge pull request #898 from PureSpider/backlight-fixJack Humbert
2016-11-22Merge pull request #896 from h-youhei/jp106Jack Humbert
2016-11-22Set backlight status to on if it's at maximum brightness already and the brig...PureSpider
2016-11-22Add japanese keymaph-youhei
2016-11-21Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7Jack Humbert
2016-11-21fix infinityJack Humbert
2016-11-21cleaning up mididJack Humbert
2016-11-21Merge pull request #894 from dchagniot/ergodoxDvorakEmacsJack Humbert
2016-11-21Merge pull request #893 from Sihui/sh-hhkb-jpJack Humbert
2016-11-21Merge pull request #892 from fredizzimo/disable_ergodox_lcdJack Humbert
2016-11-21Merge pull request #891 from g-sam/galson-keymapJack Humbert
2016-11-21Merge pull request #890 from algernon/f/space-cadet/timeoutJack Humbert
2016-11-21Merge pull request #888 from climbalima/masterJack Humbert
2016-11-21Merge pull request #887 from profet23/atreus62Jack Humbert
2016-11-21cleaning up new codeJack Humbert
2016-11-21merging lets_splitJack Humbert
2016-11-21working with helper, qmk_helper_windows@05b0105Jack Humbert
2016-11-21more structure to the packageJack Humbert
2016-11-20add del to new cmdSihui Huang
2016-11-20add space to NewCmd layerSihui Huang
2016-11-20add space to NewCmd layerSihui Huang
2016-11-20typo fixDidier Chagniot
2016-11-20Update README.mdSihui Huang
2016-11-20Update README.mdSihui Huang
2016-11-20Update README.mdSihui Huang
2016-11-20add sh-hhkb-jp layersSihui Huang
2016-11-20Always initialze the Infinity Ergodox backlightFred Sundvik
2016-11-19Merge pull request #878 from sethbc/add_sethbc_gh60_keymapJack Humbert
2016-11-19remove KC expansion from GH60Seth Chandler
2016-11-19Fix the Space Cadet timeout codeGergely Nagy
2016-11-19move KC expansion to separate macrosSeth Chandler
2016-11-19merge upstream/masterSeth Chandler
2016-11-19adds galson keymapsamgalson@gmail.com
2016-11-19Add a timeout to space-cadet shift.Gergely Nagy
2016-11-19changed readmeclimbalima
2016-11-19added the pinout for pro micro into maxipadclimbalima