summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge pull request #929 from jackhumbert/hf/size-warningsJack Humbert2016-12-024-4/+12
|\ \ | |/ |/|
| * adds warnings to 4 keymapsJack Humbert2016-12-024-4/+12
|/
* Merge pull request #881 from NoahAndrews/patch-1Jack Humbert2016-12-021-9/+9
|\
| * Recommend WSL on Windows 10Noah Andrews2016-11-141-9/+9
* | Merge pull request #915 from wez/ble_3Jack Humbert2016-12-025-1/+940
|\ \
| * | Add support for Adafruit BLE modulesWez Furlong2016-11-275-1/+940
* | | Merge pull request #914 from wez/ble_2Jack Humbert2016-12-021-0/+37
|\| |
| * | Add arduino-alike GPIO pin control helpersWez Furlong2016-11-271-0/+37
* | | Merge pull request #913 from wez/ble_1Jack Humbert2016-12-022-34/+28
|\| |
| * | Tidy up atomicity in timer.c and ring_buffer.hWez Furlong2016-11-272-34/+28
* | | Merge pull request #924 from cbbrowne/masterJack Humbert2016-12-024-10/+36
|\ \ \
| * | | I also want page-down/page-up on UPPER layercbbrowne2016-12-021-1/+1
| * | | I want page-down/page-up - put those on LOWER-Left/Right near bottom cornercbbrowne2016-12-021-1/+2
| * | | Improve docs on memory usagecbbrowne2016-12-011-0/+7
| * | | Improve docs on SYSEX bitcbbrowne2016-12-011-1/+1
| * | | More notes on .hex size protectioncbbrowne2016-12-011-3/+16
| * | | Make my builds smallercbbrowne2016-12-012-3/+7
| * | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-12-011-50/+71
| |\ \ \
| * \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-2971-346/+2112
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-2818-82/+1340
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-254-8/+47
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-2354-228/+2439
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-1622-249/+1209
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of github.com:cbbrowne/qmk_firmwarecbbrowne2016-11-110-0/+0
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChris Browne2016-11-102-1/+59
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| * | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-112-1/+59
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| / / / / / / / | | |/ / / / / / /
| * | | | | | | | Merge branch 'master' of github.com:cbbrowne/qmk_firmwarecbbrowne2016-11-070-0/+0
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of github.com:cbbrowne/qmk_firmwareChris Browne2016-11-060-0/+0
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChris Browne2016-11-0635-599/+1870
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-075-3/+178
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-0114-481/+1135
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-10-314-67/+122
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-10-2618-51/+613
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' of github.com:cbbrowne/qmk_firmwareChris Browne2016-10-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-10-2010-0/+676
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-10-1823-127/+873
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:cbbrowne/qmk_firmwarecbbrowne2016-10-170-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-10-1711-72/+497
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChris Browne2016-10-2333-127/+1549
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / | |/| | | | / / / / / / / / / / / / | | | |_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChris Browne2016-10-1611-72/+497
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | / / / / / / / / / / / / / | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-10-137-7/+523
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \