summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge pull request #945 from priyadi/planck_priyadiJack Humbert2016-12-121-6/+2
|\ \ \ \ \
| * | | | | Remove unneeded options to reduce firmware sizePriyadi Iman Nurcahyo2016-12-101-6/+2
| | |/ / / | |/| | |
* | | | | Merge pull request #944 from priyadi/negmousefixJack Humbert2016-12-121-1/+1
|\ \ \ \ \
| * | | | | Allow negative values for mouse movementsPriyadi Iman Nurcahyo2016-12-101-1/+1
| |/ / / /
* | | | | Merge pull request #943 from lucwastiaux/masterJack Humbert2016-12-123-27/+62
|\ \ \ \ \
| * | | | | put home/end on thumb clusterlucwastiaux2016-12-101-2/+2
| * | | | | readme updateslucwastiaux2016-12-101-1/+4
| * | | | | Merge remote-tracking branch 'upstream/master'lucwastiaux2016-12-10199-2387/+14766
| |\| | | |
| * | | | | use thumb cluster key to toggle brackets layerlucwastiaux2016-12-102-2/+3
| * | | | | added more shortcut keyslucwastiaux2016-11-052-9/+9
| * | | | | updated readmelucwastiaux2016-11-051-1/+2
| * | | | | removed brackets anywhere but in brackets layer, added mouse layer back in, r...lucwastiaux2016-11-053-20/+50
* | | | | | Merge pull request #942 from priyadi/cpp11Jack Humbert2016-12-121-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | The adafruit BLE C++ code requires -std=c++11Priyadi Iman Nurcahyo2016-12-101-1/+1
|/ / / / /
* | | | | Update readme.mdJack Humbert2016-12-061-1560/+2
* | | | | Merge pull request #936 from jackhumbert/f/shine_defaultErez Zukerman2016-12-063-30/+63
|\ \ \ \ \
| * | | | | A new default layout that supports ShineErez Zukerman2016-12-052-27/+59
| * | | | | Adjusts config for better mousekey supportErez Zukerman2016-12-051-3/+4
* | | | | | Merge pull request #921 from Wilba6582/raw_hidJack Humbert2016-12-057-10/+222
|\ \ \ \ \ \
| * | | | | | Update planck.cJack Humbert2016-12-041-14/+0
| * | | | | | Update rules.mkJack Humbert2016-12-040-0/+0
| * | | | | | Update rules.mkJack Humbert2016-12-041-3/+2
| * | | | | | Initial version of Raw HID interfaceWilba65822016-12-017-10/+237
* | | | | | | Merge pull request #935 from priyadi/promethiumJack Humbert2016-12-045-79/+197
|\ \ \ \ \ \ \
| * | | | | | | Remove unnecessary build optionsPriyadi Iman Nurcahyo2016-12-052-4/+5
| * | | | | | | Merge branch 'master' into promethiumPriyadi Iman Nurcahyo2016-12-0511-193/+5851
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #932 from climbalima/masterJack Humbert2016-12-0411-193/+5851
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | having trouble with conflictsclimbalima2016-12-033-20/+0
| * | | | | | | cleaned up personal projectsclimbalima2016-12-0321-7375/+0
| * | | | | | | Merge https://github.com/climbalima/qmk_firmwareclimbalima2016-12-033-22/+35
| |\ \ \ \ \ \ \
| * | | | | | | | added plate files for lets splitclimbalima2016-12-0321-0/+7375
| * | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareclimbalima2016-12-033-2/+5835
| |\ \ \ \ \ \ \ \
| * | | | | | | | | just savingclimbalima2016-11-1810-232/+54
* | | | | | | | | | Merge pull request #933 from priyadi/ps2_mouse_init_user2Jack Humbert2016-12-042-46/+55
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | syntax error fixPriyadi Iman Nurcahyo2016-12-051-1/+1
| * | | | | | | | | | Implemented weak ps2_mouse_init_user()Priyadi Iman Nurcahyo2016-12-052-47/+56
|/ / / / / / / / / /
| | | | * | | | | | syntax error fixPriyadi Iman Nurcahyo2016-12-051-1/+1
| | | | * | | | | | Trackpoint initializationPriyadi Iman Nurcahyo2016-12-052-1/+110
| | | | * | | | | | Implemented weak ps2_mouse_init_user()Priyadi Iman Nurcahyo2016-12-052-47/+56
| | | | * | | | | | Merge branch 'master' into promethiumPriyadi Iman Nurcahyo2016-12-04103-589/+3822
| | | | |\ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
* | | | | | | | | | cleans-up formatting of readmeJack Humbert2016-12-031-1/+4
| |_|_|_|_|/ / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #931 from OferPlesser/feature/improve-ps2-mouseJack Humbert2016-12-033-165/+400
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Forgot to use define in delay instead of hardcoded numberOfer Plesser2016-12-031-1/+1
| * | | | | | | | | Updated ps2 mouse documentation in readmeOfer Plesser2016-12-031-1/+111
| * | | | | | | | | Added back PS2_MOUSE_INIT_DELAY defineOfer Plesser2016-12-032-1/+4
| * | | | | | | | | Refactored and improved ps2 mouse featureofples2016-12-032-164/+286
* | | | | | | | | | Merge pull request #916 from wez/ble_4Jack Humbert2016-12-031-11/+71
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Connect the adafruit ble code to the lufa main loopWez Furlong2016-12-021-11/+71
|/ / / / / / / / /
* | | | | | | | | Merge pull request #930 from cbbrowne/masterJack Humbert2016-12-0213-9/+47
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Adds warnings to Planck keymaps that exceed 0x7000 bytes in size #929cbbrowne2016-12-0213-9/+47