Merge branch 'master' into j3rn-keymap
37 files changed, 10290 insertions(+), 2773 deletions(-) M .gitignore M keyboard/ergodox_ez/Makefile M keyboard/ergodox_ez/README.md M keyboard/ergodox_ez/ergodox_ez.c M keyboard/ergodox_ez/ergodox_ez.h A keyboard/ergodox_ez/keymaps/keymap_andrew_osx.c A keyboard/ergodox_ez/keymaps/keymap_andrew_osx.hex A keyboard/ergodox_ez/keymaps/keymap_coderkun_neo2.c A keyboard/ergodox_ez/keymaps/keymap_dave.c A keyboard/ergodox_ez/keymaps/keymap_dave.hex M keyboard/ergodox_ez/keymaps/keymap_default.c M keyboard/ergodox_ez/keymaps/keymap_default.hex D keyboard/ergodox_ez/keymaps/keymap_default_osx.png A keyboard/ergodox_ez/keymaps/keymap_dvorak.c A keyboard/ergodox_ez/keymaps/keymap_dvorak.png A keyboard/ergodox_ez/keymaps/keymap_jgarr.c A keyboard/ergodox_ez/keymaps/keymap_kastyle.c A keyboard/ergodox_ez/keymaps/keymap_kines-ish.c A keyboard/ergodox_ez/keymaps/keymap_kines-ish_README.md M keyboard/ergodox_ez/keymaps/keymap_osx_de.c M keyboard/ergodox_ez/keymaps/keymap_osx_de.hex A keyboard/ergodox_ez/keymaps/keymap_osx_de_adnw_koy.c M keyboard/ergodox_ez/keymaps/keymap_osx_de_highres.png A keyboard/ergodox_ez/keymaps/keymap_osx_fr.c A keyboard/ergodox_ez/keymaps/keymap_osx_fr.hex A keyboard/hhkb_qmk/Makefile A keyboard/hhkb_qmk/README.md A keyboard/hhkb_qmk/config.h A keyboard/hhkb_qmk/hhkb_avr.h A keyboard/hhkb_qmk/hhkb_qmk.c A keyboard/hhkb_qmk/hhkb_qmk.h A keyboard/hhkb_qmk/keymaps/keymap_default.c A keyboard/hhkb_qmk/keymaps/keymap_lxol.c A keyboard/hhkb_qmk/matrix.c M keyboard/planck/keymaps/keymap_gabriel.c A quantum/keymap_extras/keymap_french_osx.h A quantum/keymap_extras/keymap_german_osx.h