summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-042-4/+4
|\
| * Fixed the ortho60 and ortho48 matrix layout after testing (#12106)Nick Blyumberg2021-03-042-4/+4
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-0426-0/+9357
|\|
| * [Keymap] josjoha keymap for TheVan Keyboards' Minivan (#8066)Jos Boersema2021-03-0426-0/+9357
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-0410-0/+265
|\|
| * Dubba175 (#12077)drhigsby2021-03-0410-0/+265
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-041-0/+574
|\|
| * [Docs] Japanese translation of docs/keycodes.md (#10192)s-show2021-03-051-0/+574
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-042-2/+6
|\|
| * `qmk generate-rules-mk`: add `--escape` switch for makefile logic (#12101)Ryan2021-03-042-2/+6
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-0413-14/+340
|\|
| * [Keyboard] Add Studio Kestra Nue PCB (#12094)studiokestra2021-03-0311-0/+330
| * Remove ifdefs for Swap Hands keycodes (#12095)Drashna Jaelre2021-03-031-14/+10
| * cannonkeys/atlas_alps: rename via keymaps rules.mk.txt to rules.mk (#12103)James Young2021-03-031-0/+0
| * Format code according to conventions (#12102)github-actions[bot]2021-03-031-53/+53
* | Fixup line endings.Nick Brassel2021-03-041-53/+53
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-0312-0/+1245
|\|
| * [Keymap] sigma-squared (#11694)Signynt2021-03-0312-0/+1245
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-032-3/+25
|\|
| * Documentation changes SPLIT_USB_DETECT and hid_listen udev rules (#11665)individ-divided2021-03-032-3/+25
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-038-0/+915
|\|
| * [Keyboard] Add Conone 65 (#11827)Evelien-Lillian Dekkers2021-03-038-0/+915
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-039-0/+395
|\|
| * [Keyboard] Add Keyboard Rartlite (#11866)labahuy2021-03-039-0/+395
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-031-3/+3
|\|
| * Update dichotomy/alairock layout (#12013)Skyler Lewis2021-03-031-3/+3
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-032-0/+55
|\|
| * [Keyboard] Added VIA folder under the keymaps folder (#12021)Angel Rojas2021-03-032-0/+55
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-034-0/+535
|\|
| * [Keymap] Add grant24 Planck Rev 6 keymap (#12070)grant242021-03-034-0/+535
* | [Keyboard] Enable RGB Matrix for Corne (#12091)Drashna Jaelre2021-03-033-2/+2
* | Add support for complementary outputs to the WS2812 PWM driver (#11988)Sergey Vlasov2021-03-022-1/+13
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-034-0/+190
|\|
| * [Keymap] Add ddone's iris keymap (#12055)Ddone2021-03-024-0/+190
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-031-1/+1
|\|
| * [Docs] Small spelling mistake fix in leader keys (#12087)L3af2021-03-021-1/+1
* | Format code according to conventions (#12088)github-actions[bot]2021-03-033-17/+16
* | Split RGB Matrix (#11055)XScorpion22021-03-038-10/+86
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-022-14/+0
|\|
| * Remove more cruft from Lily58 default keymap (#12078)Dan Carroll2021-03-022-14/+0
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-021-1/+1
|\|
| * Set default for USB_SUSPEND_WAKEUP_DELAY to 0/disabled (#12081)Drashna Jaelre2021-03-021-1/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-021-0/+4
|\|
| * [Docs] MATRIX_MASKED docs for SPLIT_HAND_MATRIX_GRID (#11974)Trevor Elliott2021-03-011-0/+4
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-021-21/+21
|\|
| * [Keyboard] Update eggman info.json (#12074)qpockets2021-03-011-21/+21
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-021-1/+1
|\|
| * Fix the typo in ergodone 80 layout (#12075)Mega Mind2021-03-021-1/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-0214-1058/+103
|\|
| * Revert "Fixing K-type RGB lighting (#11551)" (#12065)Nick Brassel2021-03-0214-1058/+103