summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge pull request #935 from priyadi/promethiumJack Humbert2016-12-04
|\
| * Remove unnecessary build optionsPriyadi Iman Nurcahyo2016-12-05
| * Merge branch 'master' into promethiumPriyadi Iman Nurcahyo2016-12-05
| |\ | |/ |/|
* | Merge pull request #932 from climbalima/masterJack Humbert2016-12-04
|\ \
| * | having trouble with conflictsclimbalima2016-12-03
| * | cleaned up personal projectsclimbalima2016-12-03
| * | Merge https://github.com/climbalima/qmk_firmwareclimbalima2016-12-03
| |\ \
| * | | added plate files for lets splitclimbalima2016-12-03
| * | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareclimbalima2016-12-03
| |\ \ \
| * | | | just savingclimbalima2016-11-18
* | | | | Merge pull request #933 from priyadi/ps2_mouse_init_user2Jack Humbert2016-12-04
|\ \ \ \ \
| * | | | | syntax error fixPriyadi Iman Nurcahyo2016-12-05
| * | | | | Implemented weak ps2_mouse_init_user()Priyadi Iman Nurcahyo2016-12-05
|/ / / / /
| | | | * syntax error fixPriyadi Iman Nurcahyo2016-12-05
| | | | * Trackpoint initializationPriyadi Iman Nurcahyo2016-12-05
| | | | * Implemented weak ps2_mouse_init_user()Priyadi Iman Nurcahyo2016-12-05
| | | | * Merge branch 'master' into promethiumPriyadi Iman Nurcahyo2016-12-04
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | cleans-up formatting of readmeJack Humbert2016-12-03
* | | | | Merge pull request #931 from OferPlesser/feature/improve-ps2-mouseJack Humbert2016-12-03
|\ \ \ \ \
| * | | | | Forgot to use define in delay instead of hardcoded numberOfer Plesser2016-12-03
| * | | | | Updated ps2 mouse documentation in readmeOfer Plesser2016-12-03
| * | | | | Added back PS2_MOUSE_INIT_DELAY defineOfer Plesser2016-12-03
| * | | | | Refactored and improved ps2 mouse featureofples2016-12-03
* | | | | | Merge pull request #916 from wez/ble_4Jack Humbert2016-12-03
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Connect the adafruit ble code to the lufa main loopWez Furlong2016-12-02
|/ / / / /
* | | | | Merge pull request #930 from cbbrowne/masterJack Humbert2016-12-02
|\ \ \ \ \
| * | | | | Adds warnings to Planck keymaps that exceed 0x7000 bytes in size #929cbbrowne2016-12-02
* | | | | | Merge pull request #929 from jackhumbert/hf/size-warningsJack Humbert2016-12-02
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | adds warnings to 4 keymapsJack Humbert2016-12-02
|/ / / / /
* | | | | Merge pull request #881 from NoahAndrews/patch-1Jack Humbert2016-12-02
|\ \ \ \ \
| * | | | | Recommend WSL on Windows 10Noah Andrews2016-11-14
* | | | | | Merge pull request #915 from wez/ble_3Jack Humbert2016-12-02
|\ \ \ \ \ \
| * | | | | | Add support for Adafruit BLE modulesWez Furlong2016-11-27
* | | | | | | Merge pull request #914 from wez/ble_2Jack Humbert2016-12-02
|\| | | | | |
| * | | | | | Add arduino-alike GPIO pin control helpersWez Furlong2016-11-27
* | | | | | | Merge pull request #913 from wez/ble_1Jack Humbert2016-12-02
|\| | | | | |
| * | | | | | Tidy up atomicity in timer.c and ring_buffer.hWez Furlong2016-11-27
* | | | | | | Merge pull request #924 from cbbrowne/masterJack Humbert2016-12-02
|\ \ \ \ \ \ \
| * | | | | | | I also want page-down/page-up on UPPER layercbbrowne2016-12-02
| * | | | | | | I want page-down/page-up - put those on LOWER-Left/Right near bottom cornercbbrowne2016-12-02
| * | | | | | | Improve docs on memory usagecbbrowne2016-12-01
| * | | | | | | Improve docs on SYSEX bitcbbrowne2016-12-01
| * | | | | | | More notes on .hex size protectioncbbrowne2016-12-01
| * | | | | | | Make my builds smallercbbrowne2016-12-01
| * | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-12-01
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-29
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-28
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-25
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-23
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-16
| |\ \ \ \ \ \ \ \ \ \ \