~ruther/qmk_firmware

ad2a4c32039e6ac2f64aacb42dd274cc0ac46f97 — Didier Loiseau 9 years ago fb18130 + 306f183
Merge remote-tracking branch 'jackhumbert/master' into typematrix
80 files changed, 28105 insertions(+), 4409 deletions(-)

M .gitignore
A QUICK_START.md
M README.md
A Vagrantfile
A avr_setup.sh
M keyboard/ergodox_ez/Makefile
M keyboard/ergodox_ez/config.h
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
A keyboard/ergodox_ez/keymaps/coderkun_neo2/keymap.c
A keyboard/ergodox_ez/keymaps/colemak/colemak.hex
A keyboard/ergodox_ez/keymaps/colemak/keymap.c
A keyboard/ergodox_ez/keymaps/colemak/readme.md
R keyboard/ergodox_ez/keymaps/{keymap_dave => dave/dave}.hex
R keyboard/ergodox_ez/keymaps/{keymap_dave => dave/keymap}.c
A keyboard/ergodox_ez/keymaps/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
A keyboard/ergodox_ez/keymaps/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
A keyboard/ergodox_ez/keymaps/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
A keyboard/ergodox_ez/keymaps/j3rn/keymap.c
A keyboard/ergodox_ez/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_default.hex
D keyboard/ergodox_ez/keymaps/keymap_default_osx.png
D keyboard/ergodox_ez/keymaps/keymap_osx_de.hex
D keyboard/ergodox_ez/keymaps/keymap_osx_de_highres.png
A keyboard/ergodox_ez/keymaps/kines-ish/keymap.c
A keyboard/ergodox_ez/keymaps/kines-ish/kines-ish.hex
A keyboard/ergodox_ez/keymaps/kines-ish/readme.md
A keyboard/ergodox_ez/keymaps/osx_de/osx_de.hex
A keyboard/ergodox_ez/keymaps/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 => 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
A keyboard/ergodox_ez/keymaps/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
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 quantum/keymap_common.h
M quantum/keymap_extras/keymap_german.h
A quantum/keymap_extras/keymap_german_osx.h
M tmk_core/doc/build.md
This diff is too large to display. Try viewing the raw diff instead.