summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix broken bootloader builds in develop. (#15880)Dasky2022-01-1510-1/+17
|
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-143-0/+119
|\
| * [Keymap] added keymap conor with rgb layers (#15234)Conor Burns2022-01-143-0/+119
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-1463-136/+3255
|\|
| * [Keyboard] Add Keychron_q1 rev_0101 and Keychron q2 series (#15025)lalalademaxiya12022-01-1463-136/+3255
| | | | | | | | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Cesar Rojas <cesar.fieoner@gmail.com> Co-authored-by: lokher <lokher@gmail.com> Co-authored-by: Adam Karim <adam@akarsoft.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-141-1/+1
|\|
| * Make note of upper limit for `UC()` (#15870)Ryan2022-01-141-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-141-2/+0
|\|
| * Remove network drive mapping comment for WSL (#15871)Ryan2022-01-141-2/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-1410-0/+415
|\|
| * [keyboard] Adding Atlas_65 (#15839)Ryan Smith2022-01-1310-0/+415
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-1435-2001/+4223
|\|
| * [Keymap] ericgebhart keymap and userspace updates (#15727)Eric Gebhart2022-01-1335-2001/+4223
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com> Co-authored-by: Drashna Jael're <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-142-0/+129
|\|
| * [Keyboard] Add VIA support for the Drop Alt (#15857)asdfire12022-01-132-0/+129
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-1422-1/+802
|\|
| * [Keyboard] and CB87v2 and CB87RGB and fixed CB1800 and CB87 (#15824)DA2022-01-1322-1/+802
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-142-11/+113
|\|
| * [Keyboard] Fixing dactyl manuform 6x6 warnings (#15868)Bartosz Nowak2022-01-132-11/+113
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-131-1/+1
|\|
| * Fix keymap.json macro example (#15567)Tuk Bredsdorff2022-01-131-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-131-0/+80
|\|
| * Adding Quefrency keymap (#15852)peott-fr2022-01-131-0/+80
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-131-26/+28
|\|
| * [Keyboard] Fix xox70hot via layout (#15863)Drashna Jaelre2022-01-131-26/+28
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-1311-0/+548
|\|
| * [Keyboard] Add UM-A Keyboard (#15584)duoshock2022-01-1311-0/+548
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: online <33636898+online@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-1321-0/+2879
|\|
| * [Keymap] Lily58 : HELL0 NAVI. Interface (#15469)druotoni2022-01-1321-0/+2879
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-1312-0/+554
|\|
| * [Keyboard] Atlantis AK81_VE support (#15392)fOmey2022-01-1312-0/+554
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-1315-2/+487
|\|
| * [Keyboard] HoodrowG PCB (#15474)Andrew Kannan2022-01-139-0/+278
| | | | | | | | | | Co-authored-by: Julian <julianzabala1@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] new layout for squiggle (#15683)Ibnu Daru Aji2022-01-136-2/+209
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-1318-0/+998
|\|
| * [Keyboard] Add Dactyl Manuform 6x6_4 and Kinesis keyboards (#15475)Dmitriy Kuminov2022-01-1314-0/+611
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keymap] Kyria new custom keymap lw (#15729)Lucas W2022-01-134-0/+387
| |
* | move winry25tc to winry/ (#15637)peepeetee2022-01-137-5/+10
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-1319-735/+0
|\|
| * [Keyboard] remove duplicate m65 (#15831)Alin Marin Elena2022-01-1319-735/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-133-46/+84
|\|
| * [Keyboard] move enum_layers in keymaps, in sync with the other mlego/m* (#15832)Alin Marin Elena2022-01-133-46/+84
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-1317-71/+74
|\|
| * [Keymap] Misc userspace and keymap improvements (#15844)Reibl János Dániel2022-01-136-53/+50
| |
| * [Keyboard] Switch a_dux, cradio and ferris to split_3x5_2 (#15850)Albert Y2022-01-1311-18/+24
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-134-4/+101
|\|
| * [Keyboard] Fix Simpler6x boards (#15862)Drashna Jaelre2022-01-134-4/+101
| | | | | | | | | | * [Keyboard] Fix simpler64 * [Keyboard] Fix simpler61
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-1310-0/+385
|\|
| * [Keymap] Add personal keymap to GMMK Pro ANSI (#15314)Choi Byungyoon2022-01-1210-0/+385
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | PMW3389 Revert Firmware load during Initilization (#15859)Alabastard-642022-01-132-5/+2
| |