summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-0410-0/+27
|\
| * Allow APM32 MCUs on certain CannonKeys PCBs (#10899)Andrew Kannan2020-12-0310-0/+27
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-043-1/+29
|\|
| * Hotfix for #11106 (#11118)James Young2020-12-033-1/+29
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-0482-123/+1438
|\|
| * [Keyboard] add scatter42 by bbrfkr (#10893)bbrfkr2020-12-038-0/+505
| * Rework LAYOUT_alice support; add LAYOUT_alice_split_bs (#11106)James Young2020-12-0374-123/+933
* | Disable almost all ChibiOS subsystems in default configs (#11111)Nick Brassel2020-12-0416-546/+3179
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-032-0/+102
|\|
| * Add Via support to Plexus75 PCB (#11027)npspears2020-12-032-0/+102
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-031-1/+1
|\|
| * [Keyboard] Fixed inconsistent MATRIX_COLS and MATRIX_COL_PINS: facew (#8115)a_p_u_r_o2020-12-041-1/+1
* | Add board specific to Proton-C, with usual defaults turned on. (#10976)Nick Brassel2020-12-0365-17/+1659
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-029-0/+434
|\|
| * TKC TKL_A/B87: Initial support (#10943)TerryMathews2020-12-029-0/+434
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-021-0/+1
|\|
| * [Keyboard] Fix issue with Kyria and RGB Light (#11070)Dustin Bosveld2020-12-011-0/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-011-1/+1
|\|
| * Fix Valor default underglow (#11093)Xelus222020-12-021-1/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-019-18/+506
|\|
| * [Keyboard] Fix compiler issues for handwired/6macro (#11098)Drashna Jaelre2020-12-012-18/+10
| * Add support for Drop + Ryloo Studio "Hello" M0110. (#11050)David Dai2020-12-017-0/+496
* | [Split] Sync Timer feature (#10997)XScorpion22020-12-018-15/+154
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-014-8/+8
|\|
| * fix handwired/swiftrax/beegboy keymaps (#11071)Brandon Claveria2020-12-012-2/+2
| * fix handwired/swiftrax/bebol keymaps (#11072)Brandon Claveria2020-12-012-6/+6
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-012-2/+2
|\|
| * Moved default LALT and LWIN for BKS65 (#11087)Felix Jen2020-12-012-2/+2
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-0120-3/+592
|\|
| * Adding bootleg and waffling60 rev b (#10846)4pplet2020-12-0120-3/+592
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-11-301-0/+20
|\|
| * nix-shell: add milc dependency (#11086)André Silva2020-11-301-0/+20
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-11-303-2/+57
|\|
| * Added VIA keymap to YMDK bface keyboard (#11002)Desp-Key2020-11-303-2/+57
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-11-304-5/+2
|\|
| * Reduce travis load by replacing an exclusive grep with an inclusive grep (#10...Zach White2020-11-304-5/+2
* | Branch point for 2021 Feb 27 Breaking ChangeJames Young2020-11-301-0/+6
* | Configurable serial usart timeout (#11057)XScorpion22020-11-302-5/+9
|/
* Fix int wrapping for timer_expired macros and use MAX defines for consistency...XScorpion22020-11-301-2/+2
* [Keyboard] Add edc40 keyboard (#11021)ojthetiny2020-11-3010-0/+326
* KBD67 Rev2 VIA: Increase layer count from 2 to 4 (#11039)MechMerlin2020-11-302-2/+33
* map reset key to the correct location (#11037)Anand Babu (AB) Periasamy2020-11-301-2/+2
* Updated README name (#11033)Felix Jen2020-11-291-1/+1
* Cozykeys Speedo Configurator fix (#11058)James Young2020-11-296-6/+8
* 2020 November 28 Breaking Changes Update (#11053)James Young2020-11-28884-11678/+8114
* rainkeeb info.json fix (#11048)rainsff2020-11-271-1/+1
* [Docs] Add VBUS hack for teensys (#10986)Drashna Jaelre2020-11-271-0/+20
* Add rainkeeb keyboard (#10875)rainsff2020-11-279-0/+438
* Refactor qmk_install.sh (#10681)Ryan2020-11-2619-369/+360
* ST7565 tidyup (#10907)Ryan2020-11-269-153/+130