summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-131-0/+2
|\|
| * [Keyboard] Fix compile error caused by variable exclusion on Moonlander (#15860)Albert Y2022-01-121-0/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-132-17/+15
|\|
| * [Docs] Move QMK newbs build environment guide to next section (#15386)Albert Y2022-01-132-17/+15
| | | | | | Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-131-8/+0
|\|
| * kbdfans/kbd67/mkiirgb/v4: remove duplicate definitions from config.h (#15858)James Young2022-01-121-8/+0
| |
* | [Keyboard] Fix suihankey/splitDrashna Jael're2022-01-121-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-129-0/+271
|\|
| * [Keyboard] add Endless80 keyboard (#15022)moyi46812022-01-129-0/+271
| | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> 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-1214-0/+591
|\|
| * [Keyboard] Add KBIC65 keyboard (#15151)Karl B2022-01-1214-0/+591
| | | | | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Karl Berggren <berggren.karl+git@gmail.com> Co-authored-by: spacefrogfeds <73514335+spacefrogfeds@users.noreply.github.com> Co-authored-by: Karl Berggren <karber@raysearchlabs.com>
* | move id67 (#15662)peepeetee2022-01-1220-4/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-124-0/+254
|\|
| * [Keymap] Planck Keymap: Inkwell (#14311)Kevin Hartley2022-01-124-0/+254
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-129-0/+290
|\|
| * [Keyboard] add AddOn macropad (#15841)Rifaa Subekti2022-01-129-0/+290
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | move @kakunpc 's keebs into kakunpc/ (#15814)peepeetee2022-01-12132-19/+19
| | | | | | Co-authored-by: kakunpc <15257475+kakunpc@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-1218-0/+806
|\|
| * [Keyboard] Add Simpler60 support (#15499)EqualzC32022-01-1218-0/+806
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>