ac3b7d79e0
Resolved Conflicts: keyboards/kc60/rules.mk keyboards/xd96/rules.mk lib/python/qmk/cli/__init__.py |
||
---|---|---|
.. | ||
g4m3ralpha | ||
gothic50 | ||
gothic70 | ||
houndstooth | ||
jerkin | ||
kodachi50 | ||
pain27 | ||
sl40 | ||
tkl30 |
ac3b7d79e0
Resolved Conflicts: keyboards/kc60/rules.mk keyboards/xd96/rules.mk lib/python/qmk/cli/__init__.py |
||
---|---|---|
.. | ||
g4m3ralpha | ||
gothic50 | ||
gothic70 | ||
houndstooth | ||
jerkin | ||
kodachi50 | ||
pain27 | ||
sl40 | ||
tkl30 |