summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-126-7/+9
| |\ | |/ |/|
* | [Keyboard] Fix noxary Product IDs (#11771)Rozakiin2021-02-116-7/+9
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-1211-0/+493
| |\ | |/ |/|
* | [Keyboard] Support MJ65 - a 65% RGB Hotswap keyboard (#11764)MelGeek2021-02-1111-0/+493
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-111-1/+1
| |\ | |/ |/|
* | [Docs] Update feature_haptic_feedback.md (#11859)Kyle McCreery2021-02-111-1/+1
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-1016-488/+757
| |\ | |/ |/|
* | [Keymap] add noroadsleft userspace; add and update keymaps (#11686)James Young2021-02-1016-488/+757
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-103-0/+115
| |\ | |/ |/|
* | [Keymap] Added german_gaming keymap for hidtech/bastyl (#11446)Joschua Gandert2021-02-103-0/+115
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-108-34/+98
| |\ | |/ |/|
* | Userspace updates (#11841)stanrc852021-02-108-34/+98
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-109-0/+194
| |\ | |/ |/|
* | [Keyboard] Add keyboard yun65 (#11714)Spaceman2021-02-099-0/+194
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-1022-0/+3591
| |\ | |/ |/|
* | [Keyboard] Add sowbug/68keys and sowbug/ansi_tkl (#11589)Mike Tsao2021-02-0922-0/+3591
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-101-1/+1
| |\ | |/ |/|
* | Play Keyboard Helen 80: fix matrix mapping (#11585)LSChyi2021-02-091-1/+1
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-091-1/+1
| |\ | |/ |/|
* | Fix VENDOR_ID for ymd67 (#11838)Konstantin Shpits2021-02-101-1/+1
| * Remove FAUXCLICKY feature (deprecated) (#11829)Drashna Jaelre2021-02-09483-750/+48
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-0912-0/+400
| |\ | |/ |/|
* | [Keyboard] Add Splitty keyboard (#11613)Nicolas Schodet2021-02-0912-0/+400
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-0910-436/+77
| |\ | |/ |/|
* | Simplify NIBBLE encoder code and clean up keymaps (#11808)Jay Greco2021-02-0910-436/+77
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-081-21/+17
| |\ | |/ |/|
* | ws2812: Fix number of nops for AVR at 8 MHz (#9559)Sergey Vlasov2021-02-091-21/+17
| * remove deprecated qmk json-keymap (#11823)Zach White2021-02-083-22/+0
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-084-4/+4
| |\ | |/ |/|
* | Fix RGBLIGHT_LIMIT_VAL typo (#11826)Ryan2021-02-084-4/+4
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-0714-50/+22
| |\ | |/ |/|
* | Migrate some tmk_core files to quantum (#11791)Joel Challis2021-02-0714-50/+22
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-074-2/+62
| |\ | |/ |/|
* | via support for bat43 (#11729)yfuku2021-02-074-2/+62
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-071-5/+8
| |\ | |/ |/|
* | [Update] Allow APM32 on TrinityXTtkl (#11715)Xelus222021-02-071-5/+8
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-074-20/+16
| |\ | |/ |/|
* | Allow flash/compile to accept relative json paths (#11767)Joel Challis2021-02-074-20/+16
| * Merge remote-tracking branch 'upstream/master' into developfauxpark2021-02-0821-106/+2415
| |\ | |/ |/|
* | Add DSP40 (#11579)Danny2021-02-0719-0/+2193
* | Rework I2C driver docs (#11658)Ryan2021-02-082-106/+222
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-079-0/+307
| |\ | |/ |/|
* | [Keyboard] Add The Stick keyboard (#11745)Danny2021-02-079-0/+307
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-071-0/+10
| |\ | |/ |/|
* | [Docs] Update isp_flashing_guide.md (#11777)moritz-john2021-02-071-0/+10
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-072-2/+1
| |\ | |/ |/|
* | [Keymap] Update keymap for keebio/nyquist (#11734)George Petri2021-02-072-2/+1
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-072-0/+92
| |\ | |/ |/|
* | [Keymap] Shadyproject/bfo9000 (#11753)Chris M2021-02-072-0/+92
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-072-290/+297
| |\ | |/ |/|