summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-071-83/+23
|\
| * [Keyboard] Fix oled_task_user for chocolatebar (#13911)Drashna Jaelre2021-08-061-83/+23
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-072-2/+2
|\|
| * clean up CRLF instances (#13910)James Young2021-08-072-2/+2
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-079-0/+564
|\|
| * [Keyboard] Add Fave87 (#13873)Moritz2021-08-069-0/+564
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-079-0/+365
|\|
| * [Keyboard] Add MisonoWorks Chocolate Bar keyboard (#13798)misonoworks2021-08-069-0/+365
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-0710-0/+343
|\|
| * [Keyboard] Add Hex4B PCB (#13435)mechlovin2021-08-0610-0/+343
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-0710-0/+454
|\|
| * [Keyboard] Add owl8 keyboard (#13380)yfuku2021-08-0610-0/+454
* | Add HOLD_ON_OTHER_KEY_PRESS option for dual-role keys (#9404)Sergey Vlasov2021-08-072-19/+106
* | Copy GMMK Pro screw specs to ISO readme (#13908)Gigahawk2021-08-071-0/+14
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-061-0/+14
|\|
| * Add replacement screw specifications to GMMK Pro readme (#13903)Gigahawk2021-08-061-0/+14
* | Update ChibiOS-Contrib, mirroring script. (#13896)Nick Brassel2021-08-062-9/+37
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-065-1/+19
|\|
| * Avoid name conflicts with usb_hid Arduino code (#13870)Joel Challis2021-08-065-1/+19
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-067-65/+132
|\|
| * Flehrad Tradestation Refactor (#13897)James Young2021-08-057-65/+132
* | [Keyboard] Remove console from keebio via keyboards (#13901)Drashna Jaelre2021-08-052-2/+0
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-061-49/+718
|\|
| * MetaMechs Timber Wolf Configurator Fixes (#13895)James Young2021-08-051-49/+718
* | Fix up builds after #8591 (#13900)Nick Brassel2021-08-0631-655/+0
* | Process combos earlier & overlapping combos (#8591)Pete Sevander2021-08-0611-165/+841
* | [Feature] Swap buttons on PS2 Mouse/Trackball (#9205)Juan Pablo Kutianski2021-08-062-0/+17
* | add yaml_build_options target (#10533)Takeshi ISHII2021-08-061-0/+20
* | Rework as per 9824 (#13898)Nick Brassel2021-08-0619-7/+7
* | Arm ps2 mouse interrupt (#6490)JohSchneider2021-08-065-20/+172
* | Bump gtest (#13885)Joel Challis2021-08-051-0/+0
* | Tidy up rgbkb/mun (#13801)Joel Challis2021-08-0511-201/+334
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-047-211/+237
|\|
| * cKeys Handwire 101 Refactor (#13879)James Young2021-08-047-211/+237
* | [Keyboard] Fix knops keymaps (#13872)Dasky2021-08-045-82/+82
* | [Keyboard] Switch Draculad to using WPM char hack (#13886)Drashna Jaelre2021-08-042-23/+28
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-046-98/+101
|\|
| * BM65ISO: refactor layout macro (#13860)James Young2021-08-046-98/+101
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-0419-0/+1697
|\|
| * Updated Ducky 2 one mini support (#11112)Reza Jelveh2021-08-0419-0/+1697
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-041-1/+1
|\|
| * barracuda: update info.json layout macro reference (#13874)James Young2021-08-042-3/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-043-9/+27
|\|
| * Add bootloader section to keyboard template (#13774)Drashna Jaelre2021-08-042-2/+17
| * Updated settings.json file to fit VSC's docs (#13829)Changsu Park2021-08-041-7/+10
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-031-1/+1
|\|
| * boardsource/holiday/spooky: update info.json layout macro reference (#13875)James Young2021-08-041-1/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-0310-0/+347
|\|
| * rb86 (#13824)Ryan Baker2021-08-0410-0/+347
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-031-2/+12
|\|