diff options
author | Stephen Tudor <smt@smt.io> | 2017-01-28 06:51:07 +0100 |
---|---|---|
committer | Stephen Tudor <smt@smt.io> | 2017-01-28 06:51:07 +0100 |
commit | fa72689145ccbee120c236111c0e8813afa7881a (patch) | |
tree | 7eb408d19987ad05c6156331e50d6921c82aea50 /keyboards/phantom/rules.mk | |
parent | 63e406eca4da805617889f7ab769a781c0046742 (diff) | |
parent | ec05f654210a01ef82db2ab54e6065783536b802 (diff) | |
download | qmk_firmware-fa72689145ccbee120c236111c0e8813afa7881a.tar.gz qmk_firmware-fa72689145ccbee120c236111c0e8813afa7881a.tar.xz |
Merge branch 'master' into smt/planck
* master:
Clarify license on abnt2 keymap (#1038)
replace jackhumbert with qmk
Add gitter image, start update to qmk org
Remove COLEMAK from preonic_keycodes enum
layer defines to enum
Update readme for smt Preonic keymap
Add smt keymap for Preonic
updated all the other keymaps to support the new changes.
fix: infinity60 keyboard was not using quantum features.
Compare Makefile with itself instead of using `--help`
Diffstat (limited to 'keyboards/phantom/rules.mk')
0 files changed, 0 insertions, 0 deletions