ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into develop

Browse source 
Resolved Conflicts:
    keyboards/kc60/rules.mk
    keyboards/xd96/rules.mk
    lib/python/qmk/cli/__init__.py
This commit is contained in:
Zach White 2020-11-22 08:28:53 -08:00
commit ac3b7d79e0
938 changed files with 35990 additions and 13003 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/python/qmk/cli/__init__.py
View file

@ -9,6 +9,7 @@ from milc import cli
from . import c2json
from . import cformat
from . import chibios
from . import clean
from . import compile
from . import config
from . import docs
@ -19,6 +20,7 @@ from . import hello
from . import info
from . import json
from . import json2c
from . import lint
from . import list
from . import kle2json
from . import new