~ruther/qmk_firmware

ec62d9e85cab5cf166241b0536120d005fa7c898 — IBNobody 9 years ago 8a2457d + 403d756
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'

# Conflicts:
#	quantum/template/template.c
#	quantum/template/template.h
88 files changed, 34428 insertions(+), 41597 deletions(-)

M keyboard/atomic/atomic.c
M keyboard/atomic/atomic.h
M keyboard/atreus/atreus.c
M keyboard/atreus/atreus.h
A keyboard/ergodox_ez/190hotfix.sh
M keyboard/ergodox_ez/ergodox_ez.c
M keyboard/ergodox_ez/ergodox_ez.h
M keyboard/ergodox_ez/keymaps/andrew_osx/andrew_osx.hex
M keyboard/ergodox_ez/keymaps/andrew_osx/keymap.c
M keyboard/ergodox_ez/keymaps/coderkun_neo2/coderkun_neo2.hex
M keyboard/ergodox_ez/keymaps/coderkun_neo2/keymap.c
M keyboard/ergodox_ez/keymaps/colemak/colemak.hex
M keyboard/ergodox_ez/keymaps/colemak/keymap.c
M keyboard/ergodox_ez/keymaps/colemak_osx_pc_no/colemak_osx_pc_no.hex
M keyboard/ergodox_ez/keymaps/csharp_dev/csharp_dev.hex
M keyboard/ergodox_ez/keymaps/csharp_dev/csharp_dev.png
M keyboard/ergodox_ez/keymaps/csharp_dev/csharp_dev_legend.png
M keyboard/ergodox_ez/keymaps/csharp_dev/keymap.c
M keyboard/ergodox_ez/keymaps/csharp_dev/readme.md
M keyboard/ergodox_ez/keymaps/dave/dave.hex
M keyboard/ergodox_ez/keymaps/dave/keymap.c
M keyboard/ergodox_ez/keymaps/default/default.hex
M keyboard/ergodox_ez/keymaps/default/keymap.c
M keyboard/ergodox_ez/keymaps/default_osx/default_osx.hex
M keyboard/ergodox_ez/keymaps/default_osx/keymap.c
M keyboard/ergodox_ez/keymaps/dragon788/dragon788.hex
M keyboard/ergodox_ez/keymaps/dragon788/keymap.c
M keyboard/ergodox_ez/keymaps/dvorak/dvorak.hex
M keyboard/ergodox_ez/keymaps/dvorak/keymap.c
M keyboard/ergodox_ez/keymaps/emacs_osx_dk/emacs_osx_dk.hex
M keyboard/ergodox_ez/keymaps/emacs_osx_dk/keymap.c
M keyboard/ergodox_ez/keymaps/erez_experimental/erez_experimental.hex
M keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c
M keyboard/ergodox_ez/keymaps/german-kinergo/german-kinergo.hex
M keyboard/ergodox_ez/keymaps/german-kinergo/keymap.c
M keyboard/ergodox_ez/keymaps/german/german.hex
M keyboard/ergodox_ez/keymaps/german/keymap.c
M keyboard/ergodox_ez/keymaps/j3rn/j3rn.hex
M keyboard/ergodox_ez/keymaps/j3rn/keymap.c
M keyboard/ergodox_ez/keymaps/jack/jack.hex
M keyboard/ergodox_ez/keymaps/jack/keymap.c
M keyboard/ergodox_ez/keymaps/jacobono/jacobono.hex
M keyboard/ergodox_ez/keymaps/jacobono/keymap.c
M keyboard/ergodox_ez/keymaps/jgarr/jgarr.hex
M keyboard/ergodox_ez/keymaps/jgarr/keymap.c
M keyboard/ergodox_ez/keymaps/kastyle/kastyle.hex
M keyboard/ergodox_ez/keymaps/kastyle/keymap.c
M keyboard/ergodox_ez/keymaps/kines-ish/keymap.c
M keyboard/ergodox_ez/keymaps/kines-ish/kines-ish.hex
M keyboard/ergodox_ez/keymaps/mpiechotka/keymap.c
M keyboard/ergodox_ez/keymaps/mpiechotka/mpiechotka.hex
M keyboard/ergodox_ez/keymaps/ordinary/keymap.c
M keyboard/ergodox_ez/keymaps/ordinary/ordinary.hex
M keyboard/ergodox_ez/keymaps/osx_de/keymap.c
M keyboard/ergodox_ez/keymaps/osx_de/osx_de.hex
M keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/keymap.c
M keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/osx_de_adnw_koy.hex
M keyboard/ergodox_ez/keymaps/osx_fr/keymap.c
M keyboard/ergodox_ez/keymaps/osx_fr/osx_fr.hex
M keyboard/ergodox_ez/keymaps/osx_kinesis_pnut/keymap.c
M keyboard/ergodox_ez/keymaps/plover/keymap.c
M keyboard/ergodox_ez/keymaps/plover/plover.hex
A keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keymap.c
A keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md
A keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.hex
A keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.png
M keyboard/ergodox_ez/keymaps/software_neo2/keymap.c
M keyboard/ergodox_ez/keymaps/software_neo2/software_neo2.hex
M keyboard/ergodox_ez/keymaps/tm2030/keymap.c
D keyboard/ergodox_ez/keymaps/tm2030/keymap.hex
A keyboard/ergodox_ez/keymaps/tm2030/tm2030.hex
M keyboard/ergodox_ez/keymaps/tonyabra_osx/keymap.c
M keyboard/ergodox_ez/keymaps/tonyabra_osx/tonyabra_osx.hex
M keyboard/ergodox_ez/keymaps/workman_osx_mdw/keymap.c
M keyboard/ergodox_ez/keymaps/workman_osx_mdw/workman_osx_mdw.hex
A keyboard/ergodox_ez/makeallhex.sh
M keyboard/ergodox_ez/matrix.c
M keyboard/hhkb_qmk/hhkb_qmk.c
M keyboard/hhkb_qmk/hhkb_qmk.h
M keyboard/jd45/jd45.c
M keyboard/jd45/jd45.h
M keyboard/planck/keymaps/lock/keymap.c
M keyboard/planck/planck.c
M keyboard/planck/planck.h
M quantum/matrix.c
M quantum/template/template.c
M quantum/template/template.h
M tmk_core/common/matrix.h
This diff is too large to display. Try viewing the raw diff instead.