summaryrefslogtreecommitdiff
path: root/keyboards/ergodox/ez
diff options
context:
space:
mode:
authorStephen Tudor <smt@smt.io>2017-01-28 00:51:07 -0500
committerStephen Tudor <smt@smt.io>2017-01-28 00:51:07 -0500
commitfa72689145ccbee120c236111c0e8813afa7881a (patch)
tree7eb408d19987ad05c6156331e50d6921c82aea50 /keyboards/ergodox/ez
parent63e406eca4da805617889f7ab769a781c0046742 (diff)
parentec05f654210a01ef82db2ab54e6065783536b802 (diff)
downloadqmk_firmware-fa72689145ccbee120c236111c0e8813afa7881a.tar.gz
qmk_firmware-fa72689145ccbee120c236111c0e8813afa7881a.zip
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/ergodox/ez')
0 files changed, 0 insertions, 0 deletions