summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-12-05Merge branch 'master' into promethiumPriyadi Iman Nurcahyo
2016-12-04Merge pull request #932 from climbalima/masterJack Humbert
2016-12-04Merge pull request #933 from priyadi/ps2_mouse_init_user2Jack Humbert
2016-12-05syntax error fixPriyadi Iman Nurcahyo
2016-12-05syntax error fixPriyadi Iman Nurcahyo
2016-12-05Implemented weak ps2_mouse_init_user()Priyadi Iman Nurcahyo
2016-12-05Trackpoint initializationPriyadi Iman Nurcahyo
2016-12-05Implemented weak ps2_mouse_init_user()Priyadi Iman Nurcahyo
2016-12-04Merge branch 'master' into promethiumPriyadi Iman Nurcahyo
2016-12-04fix emoji LED indicators.Priyadi Iman Nurcahyo
2016-12-04fix RGB LED orderPriyadi Iman Nurcahyo
2016-12-03having trouble with conflictsclimbalima
2016-12-03cleaned up personal projectsclimbalima
2016-12-03Merge https://github.com/climbalima/qmk_firmwareclimbalima
2016-12-03added plate files for lets splitclimbalima
2016-12-03Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareclimbalima
2016-12-03cleans-up formatting of readmeJack Humbert
2016-12-03Merge pull request #931 from OferPlesser/feature/improve-ps2-mouseJack Humbert
2016-12-03Merge pull request #916 from wez/ble_4Jack Humbert
2016-12-03Forgot to use define in delay instead of hardcoded numberOfer Plesser
2016-12-03Updated ps2 mouse documentation in readmeOfer Plesser
2016-12-03Added back PS2_MOUSE_INIT_DELAY defineOfer Plesser
2016-12-03Refactored and improved ps2 mouse featureofples
2016-12-02Connect the adafruit ble code to the lufa main loopWez Furlong
2016-12-02Merge pull request #930 from cbbrowne/masterJack Humbert
2016-12-02Merge pull request #929 from jackhumbert/hf/size-warningsJack Humbert
2016-12-02Adds warnings to Planck keymaps that exceed 0x7000 bytes in size #929cbbrowne
2016-12-02adds warnings to 4 keymapsJack Humbert
2016-12-02Merge pull request #881 from NoahAndrews/patch-1Jack Humbert
2016-12-02Merge pull request #915 from wez/ble_3Jack Humbert
2016-12-02Merge pull request #914 from wez/ble_2Jack Humbert
2016-12-02Merge pull request #913 from wez/ble_1Jack Humbert
2016-12-02Merge pull request #924 from cbbrowne/masterJack Humbert
2016-12-02Annotates nordicErez Zukerman
2016-12-02Tweaks Kristian's layout againErez Zukerman
2016-12-02Kristian's keymapErez Zukerman
2016-12-02I also want page-down/page-up on UPPER layercbbrowne
2016-12-02I want page-down/page-up - put those on LOWER-Left/Right near bottom cornercbbrowne
2016-12-01Improve docs on memory usagecbbrowne
2016-12-01Improve docs on SYSEX bitcbbrowne
2016-12-01More notes on .hex size protectioncbbrowne
2016-12-01Make my builds smallercbbrowne
2016-12-01Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne
2016-11-30Better layoutErez Zukerman
2016-11-29Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne
2016-11-29Merge pull request #919 from jackhumbert/hf/robot_test_layoutJack Humbert
2016-11-29Test layout for ErgoDox EZ manufacturing robotErez Zukerman
2016-11-29Merge pull request #918 from jackhumbert/wu5y7Erez Zukerman
2016-11-29Merge pull request #917 from gid0/masterErez Zukerman
2016-11-29guess i didnt pullJack Humbert