Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
55 files changed, 20753 insertions(+), 1722 deletions(-) M keyboard/ergodox_ez/Makefile R keyboard/ergodox_ez/keymaps/{keymap_andrew_osx => andrew_osx/andrew_osx}.hex R keyboard/ergodox_ez/keymaps/{keymap_andrew_osx => andrew_osx/keymap}.c A keyboard/ergodox_ez/keymaps/coderkun_neo2/coderkun_neo2.hex R keyboard/ergodox_ez/keymaps/{keymap_coderkun_neo2 => coderkun_neo2/keymap}.c R keyboard/ergodox_ez/keymaps/{keymap_dave => dave/dave}.hex R keyboard/ergodox_ez/keymaps/{keymap_dave => dave/keymap}.c R keyboard/ergodox_ez/keymaps/{keymap_default => default/default}.hex R keyboard/ergodox_ez/keymaps/{keymap_default => default/default}.png R keyboard/ergodox_ez/keymaps/{keymap_default_highres => default/default_highres}.png R keyboard/ergodox_ez/keymaps/{keymap_default => default/keymap}.c A keyboard/ergodox_ez/keymaps/default/readme.md R keyboard/ergodox_ez/keymaps/{keymap_default_osx => default_osx/default_osx}.hex R keyboard/ergodox_ez/keymaps/{keymap_default_osx_highres => default_osx/default_osx_highres}.png R keyboard/ergodox_ez/keymaps/{keymap_default_osx => default_osx/keymap}.c A keyboard/ergodox_ez/keymaps/default_osx/readme.md A keyboard/ergodox_ez/keymaps/dragon788/dragon788.hex R keyboard/ergodox_ez/keymaps/{keymap_dragon788 => dragon788/keymap}.c A keyboard/ergodox_ez/keymaps/dvorak/dvorak.hex R keyboard/ergodox_ez/keymaps/{keymap_dvorak => dvorak/dvorak}.png R keyboard/ergodox_ez/keymaps/{keymap_dvorak => dvorak/keymap}.c A keyboard/ergodox_ez/keymaps/erez_experimental/erez_experimental.hex R keyboard/ergodox_ez/keymaps/{keymap_erez_experimental => erez_experimental/keymap}.c A keyboard/ergodox_ez/keymaps/erez_experimental/readme.md A keyboard/ergodox_ez/keymaps/german/german.hex R keyboard/ergodox_ez/keymaps/{keymap_german => german/keymap}.c A keyboard/ergodox_ez/keymaps/j3rn/j3rn.hex R keyboard/ergodox_ez/keymaps/{keymap_j3rn => j3rn/keymap}.c R keyboard/ergodox_ez/{keymap_j3rn_README => keymaps/j3rn/readme}.md A keyboard/ergodox_ez/keymaps/jack/jack.hex R keyboard/ergodox_ez/keymaps/{keymap_jack => jack/keymap}.c A keyboard/ergodox_ez/keymaps/jgarr/jgarr.hex R keyboard/ergodox_ez/keymaps/{keymap_jgarr => jgarr/keymap}.c A keyboard/ergodox_ez/keymaps/kastyle/kastyle.hex R keyboard/ergodox_ez/keymaps/{keymap_kastyle => kastyle/keymap}.c D keyboard/ergodox_ez/keymaps/keymap_osx_de.c R keyboard/ergodox_ez/keymaps/{keymap_kines-ish => kines-ish/keymap}.c A keyboard/ergodox_ez/keymaps/kines-ish/kines-ish.hex R keyboard/ergodox_ez/keymaps/{keymap_kines-ish_README => kines-ish/readme}.md R keyboard/ergodox_ez/keymaps/{keymap_osx_de => osx_de/osx_de}.hex R keyboard/ergodox_ez/keymaps/{keymap_osx_de_highres => osx_de/osx_de_highres}.png R keyboard/ergodox_ez/keymaps/{keymap_osx_de_README => osx_de/readme}.md R keyboard/ergodox_ez/keymaps/{keymap_osx_de_adnw_koy => osx_de_adnw_koy/keymap}.c A keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/osx_de_adnw_koy.hex R keyboard/ergodox_ez/keymaps/{keymap_osx_fr => osx_fr/keymap}.c R keyboard/ergodox_ez/keymaps/{keymap_osx_fr => osx_fr/osx_fr}.hex R keyboard/ergodox_ez/keymaps/{keymap_osx_kinesis_pnut => osx_kinesis_pnut/keymap}.c R keyboard/ergodox_ez/keymaps/{keymap_plover => plover/keymap}.c A keyboard/ergodox_ez/keymaps/plover/plover.hex R keyboard/ergodox_ez/keymaps/{keymap_software_neo2 => software_neo2/keymap}.c A keyboard/ergodox_ez/keymaps/software_neo2/software_neo2.hex R keyboard/ergodox_ez/keymaps/{keymap_workman_osx_mdw => workman_osx_mdw/keymap}.c A keyboard/ergodox_ez/keymaps/workman_osx_mdw/workman_osx_mdw.hex R keyboard/ergodox_ez/{README => readme}.md D keyboard/ergodox_ez/reference_compiled_default_firmware.hex