Merge pull request #5 from jackhumbert/master Sync with upstream
114 files changed, 12942 insertions(+), 3408 deletions(-) M 1-setup-path-win.bat M BUILD_GUIDE.md M README.md M keyboard/alps64/Makefile R keyboard/alps64/{keymap_plain => keymaps/default}.c R keyboard/alps64/{keymap_hasu => keymaps/hasu}.c M keyboard/atomic/Makefile M keyboard/atomic/README.md R keyboard/atomic/keymaps/{keymap_abienz => abienz}.c R keyboard/atomic/keymaps/{keymap_default => default}.c R keyboard/atomic/keymaps/{keymap_michelle => michelle}.c M keyboard/atreus/Makefile M keyboard/atreus/README.md R keyboard/atreus/keymaps/{keymap_default => default}.c R keyboard/atreus/keymaps/{keymap_gerb => gerb}.c A keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/README.md A keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/dvorak_intl_squisher.hex A keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout0.png A keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout1.png A keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout2.png A keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/keymap.c A keyboard/ergodox_ez/keymaps/german-manuneo/compile_keymap.py A keyboard/ergodox_ez/keymaps/german-manuneo/german-manuneo.hex A keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c A keyboard/ergodox_ez/keymaps/german-manuneo/keymap.md A keyboard/ergodox_ez/keymaps/msc/img/code_layer.png A keyboard/ergodox_ez/keymaps/msc/img/main_layer.png A keyboard/ergodox_ez/keymaps/msc/img/media_layer.png A keyboard/ergodox_ez/keymaps/msc/keymap.c A keyboard/ergodox_ez/keymaps/msc/msc.hex A keyboard/ergodox_ez/keymaps/msc/readme.md 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/osx_de_highres.png M keyboard/gh60/Makefile M keyboard/gh60/Makefile.pjrc M keyboard/gh60/README.md R keyboard/gh60/{keymap_hasu => keymaps/hasu}.c R keyboard/gh60/{keymap_hhkb => keymaps/hhkb}.c R keyboard/gh60/{keymap_plain => keymaps/plain}.c R keyboard/gh60/{keymap_poker => keymaps/poker}.c R keyboard/gh60/{keymap_poker_bit => keymaps/poker_bit}.c R keyboard/gh60/{keymap_poker_set => keymaps/poker_set}.c R keyboard/gh60/{keymap_spacefn => keymaps/spacefn}.c M keyboard/hhkb/Makefile M keyboard/hhkb/Makefile.pjrc M keyboard/hhkb/Makefile.rn42 M keyboard/hhkb/README.md R keyboard/hhkb/{keymap_hasu => keymaps/hasu}.c R keyboard/hhkb/{keymap_hhkb => keymaps/hhkb}.c R keyboard/hhkb/{keymap_jp => keymaps/jp}.c R keyboard/hhkb/{keymap_spacefn => keymaps/spacefn}.c M keyboard/hhkb_qmk/Makefile M keyboard/hhkb_qmk/README.md R keyboard/hhkb_qmk/keymaps/{keymap_default => default}.c R keyboard/hhkb_qmk/keymaps/{keymap_lxol => lxol}.c M keyboard/jd45/Makefile R keyboard/jd45/keymaps/{keymap_default => default}.c R keyboard/jd45/keymaps/{keymap_justin => justin}.c M keyboard/planck/Makefile M keyboard/planck/README.md M keyboard/planck/keymaps/default/keymap.c A keyboard/planck/keymaps/tak3over.c R keyboard/planck/{ => old_keymap_files}/common_keymaps/keymap_mitch.c M keyboard/planck/planck.c M keyboard/planck/planck.h M keyboard/preonic/Makefile D keyboard/preonic/Makefile.pjrc D keyboard/preonic/PCB_GUIDE.md M keyboard/preonic/README.md D keyboard/preonic/__avr_gdbinit D keyboard/preonic/analog.c D keyboard/preonic/analog.h D keyboard/preonic/beeps.c D keyboard/preonic/beeps.h M keyboard/preonic/config.h D keyboard/preonic/config_definitions.h D keyboard/preonic/extended_keymap_common.c D keyboard/preonic/extended_keymap_common.h D keyboard/preonic/extended_keymaps/extended_keymap_default.c D keyboard/preonic/extended_keymaps/extended_keymap_lock.c A keyboard/preonic/flash-pcb.sh D keyboard/preonic/keymap_midi.c D keyboard/preonic/keymap_midi.h A keyboard/preonic/keymaps/default/README.md A keyboard/preonic/keymaps/default/keymap.c A keyboard/preonic/keymaps/lock/README.md A keyboard/preonic/keymaps/lock/keymap.c A keyboard/preonic/keymaps/nerdgasm/README.md A keyboard/preonic/keymaps/nerdgasm/keymap.c D keyboard/preonic/led.c D keyboard/preonic/matrix.c A keyboard/preonic/preonic.c A keyboard/preonic/preonic.h A keyboard/preonic/preonic_music.hex A keyboard/preonic/preonic_pcb.hex A keyboard/preonic/preonic_pcb_silent.hex M keyboard/retro_refit/Makefile M keyboard/retro_refit/config.h M quantum/audio.c M quantum/keymap_common.c M quantum/keymap_extras/keymap_german_osx.h M quantum/keymap_midi.c M quantum/template/Makefile M quantum/template/README.md M quantum/template/config.h M quantum/template/template.c M quantum/template/template.h M tmk_core/common/action.c M tmk_core/common/action.h M tmk_core/common/avr/suspend.c M tmk_core/common/command.c M tmk_core/common/command.h M tmk_core/common/keyboard.c