summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-179-0/+652
|\
| * [Keyboard] add n6 keyboard (#13768)yulei2021-08-179-0/+652
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-172-50/+75
|\|
| * [Keyboard] bastardkb/skeletyl: fix LED configuration (#14030)Charly Delay2021-08-172-50/+75
* | Fix wait_us overflow in matrix for dactyl based boards (#14039)Drashna Jaelre2021-08-172-2/+2
* | Add a lot more data to info.json (#13366)Zach White2021-08-1617-99/+654
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-164-8/+11
|\|
| * ryanbaekr rb86: rename LAYOUT_numpad_6x17 to LAYOUT (#14011)James Young2021-08-164-8/+11
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-162-8/+67
|\|
| * MisonoWorks Chocolate Bar Configurator fixes (#14009)James Young2021-08-162-8/+67
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-163-283/+531
|\|
| * Linworks Fave87 Layout Macro Refactor (#14008)James Young2021-08-163-283/+531
* | Unify behaviour of wait on AVR (#14025)Joel Challis2021-08-161-2/+20
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-163-5/+32
|\|
| * Pimentoso TouhouPad Layout Macro refactor (#14010)James Young2021-08-163-5/+32
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-161-2/+2
|\|
| * Fix line endings in keyboards/absinthe/keymaps/via/rules.mk (#14028)James Young2021-08-151-2/+2
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-166-56/+269
|\|
| * Gorthage Truck Refactor (#14006)James Young2021-08-156-56/+269
* | Move all the flash logic from tmk_core (#13927)Joel Challis2021-08-157-269/+278
* | Fixup Audio startup and add to documents (#13606)Drashna Jaelre2021-08-153-1/+30
* | Remove MIDI Configuration boilerplate (#11151)James Young2021-08-16879-5365/+23
* | Defer the expensive search for layout macros until info.json has been process...Zach White2021-08-161-19/+24
* | Fix ifdefs for OLED split sync code (#14017)Drashna Jaelre2021-08-154-6/+7
* | Enable sync of OLED/ST7565 display on/off state on Splits (#13542)Drashna Jaelre2021-08-155-21/+123
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-08-1520-457/+434
|\|
| * AL1 refactor (#13679)Ryan2021-08-1510-414/+391
| * LFKeyboards: Replace `KC_FNx` with `F(x)` (#13999)Ryan2021-08-1510-44/+44
* | Fix errors that have cropped up in develop (#14005)Zach White2021-08-152-15/+1
* | [Keyboard] ez_maker/directpins for easy one-offs in qmk_configurator (#13321)Zach White2021-08-1447-0/+1141
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-1410-0/+714
|\|
| * [Keyboard] Add TKL-FF PCB (#14003)Ramon Imbao2021-08-1410-0/+714
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-149-0/+216
|\|
| * [Keyboard] add Stealth macropad (#13986)Rifaa Subekti2021-08-149-0/+216
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-141-75/+80
|\|
| * Rework keymap_extras docs (#13949)Ryan2021-08-151-75/+80
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-145-60/+76
|\|
| * Ducky One2mini Layout Macro fixes (#14002)James Young2021-08-145-60/+76
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-141-4/+537
|\|
| * Function96 V2 Configurator fixes (#13996)James Young2021-08-141-4/+537
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-143-111/+133
|\|
| * Orthocode Layout Macro rework (#13995)James Young2021-08-143-111/+133
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-144-37/+131
|\|
| * Noxary 378 Layout Macro rework (#13998)James Young2021-08-144-37/+131
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-149-0/+292
|\|
| * add falcon keyboard (#13674)yulei2021-08-149-0/+292
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-1410-70/+466
|\|
| * [Keyboard] Add Irene Keyboard (#13991)Ramon Imbao2021-08-139-0/+396
| * Fix Line endings in Absinthe VIA keymap (#13997)Drashna Jaelre2021-08-141-70/+70
* | Fix `combo_disable` (#13988)Pete Sevander2021-08-141-8/+10