summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2016-12-07Merge remote-tracking branch 'upstream/master'xyverz159-2209/+12520
2016-12-06Update readme.mdJack Humbert1-1560/+2
2016-12-06Merge pull request #936 from jackhumbert/f/shine_defaultErez Zukerman3-30/+63
2016-12-06A new default layout that supports ShineErez Zukerman2-27/+59
2016-12-06Adjusts config for better mousekey supportErez Zukerman1-3/+4
2016-12-05Merge pull request #921 from Wilba6582/raw_hidJack Humbert7-10/+222
2016-12-05Update planck.cJack Humbert1-14/+0
2016-12-05Update rules.mkJack Humbert0-0/+0
2016-12-05Update rules.mkJack Humbert1-3/+2
2016-12-05Merge pull request #935 from priyadi/promethiumJack Humbert5-79/+197
2016-12-04Remove unnecessary build optionsPriyadi Iman Nurcahyo2-4/+5
2016-12-04Merge branch 'master' into promethiumPriyadi Iman Nurcahyo11-193/+5851
2016-12-04Merge pull request #932 from climbalima/masterJack Humbert11-193/+5851
2016-12-04Merge pull request #933 from priyadi/ps2_mouse_init_user2Jack Humbert2-46/+55
2016-12-04syntax error fixPriyadi Iman Nurcahyo1-1/+1
2016-12-04syntax error fixPriyadi Iman Nurcahyo1-1/+1
2016-12-04Implemented weak ps2_mouse_init_user()Priyadi Iman Nurcahyo2-47/+56
2016-12-04Trackpoint initializationPriyadi Iman Nurcahyo2-1/+110
2016-12-04Implemented weak ps2_mouse_init_user()Priyadi Iman Nurcahyo2-47/+56
2016-12-04Merge branch 'master' into promethiumPriyadi Iman Nurcahyo103-589/+3822
2016-12-04fix emoji LED indicators.Priyadi Iman Nurcahyo1-20/+28
2016-12-04fix RGB LED orderPriyadi Iman Nurcahyo1-54/+54
2016-12-03having trouble with conflictsclimbalima3-20/+0
2016-12-03cleaned up personal projectsclimbalima21-7375/+0
2016-12-03Merge https://github.com/climbalima/qmk_firmwareclimbalima3-22/+35
2016-12-03added plate files for lets splitclimbalima21-0/+7375
2016-12-03Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareclimbalima3-2/+5835
2016-12-03cleans-up formatting of readmeJack Humbert1-1/+4
2016-12-03Merge pull request #931 from OferPlesser/feature/improve-ps2-mouseJack Humbert3-165/+400
2016-12-03Merge pull request #916 from wez/ble_4Jack Humbert1-11/+71
2016-12-03Forgot to use define in delay instead of hardcoded numberOfer Plesser1-1/+1
2016-12-03Updated ps2 mouse documentation in readmeOfer Plesser1-1/+111
2016-12-03Added back PS2_MOUSE_INIT_DELAY defineOfer Plesser2-1/+4
2016-12-03Refactored and improved ps2 mouse featureofples2-164/+286
2016-12-03Connect the adafruit ble code to the lufa main loopWez Furlong1-11/+71
2016-12-02Merge pull request #930 from cbbrowne/masterJack Humbert13-9/+47
2016-12-02Merge pull request #929 from jackhumbert/hf/size-warningsJack Humbert4-4/+12
2016-12-02Adds warnings to Planck keymaps that exceed 0x7000 bytes in size #929cbbrowne13-9/+47
2016-12-02adds warnings to 4 keymapsJack Humbert4-4/+12
2016-12-02Merge pull request #881 from NoahAndrews/patch-1Jack Humbert1-9/+9
2016-12-02Merge pull request #915 from wez/ble_3Jack Humbert5-1/+940
2016-12-02Merge pull request #914 from wez/ble_2Jack Humbert1-0/+37
2016-12-02Merge pull request #913 from wez/ble_1Jack Humbert2-34/+28
2016-12-02Merge pull request #924 from cbbrowne/masterJack Humbert4-10/+36
2016-12-02Annotates nordicErez Zukerman1-1/+1
2016-12-02Tweaks Kristian's layout againErez Zukerman1-1/+1
2016-12-02Kristian's keymapErez Zukerman1-0/+79
2016-12-02I also want page-down/page-up on UPPER layercbbrowne1-1/+1
2016-12-02I want page-down/page-up - put those on LOWER-Left/Right near bottom cornercbbrowne1-1/+2
2016-12-01Improve docs on memory usagecbbrowne1-0/+7