~ruther/qmk_firmware

47dd29513eeec7b7f639bef6df441a905ce8bacb — Wojciech Siewierski 9 years ago 8ef14d0 + 8d39263
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware into modifier-release-fix
219 files changed, 47745 insertions(+), 42647 deletions(-)

M 1-setup-path-win.bat
M BUILD_GUIDE.md
M README.md
A keyboard/Bantam44/Bantam44.c
A keyboard/Bantam44/Bantam44.h
R keyboard/{preonic/Makefile.pjrc => Bantam44/Makefile}
A keyboard/Bantam44/README.md
A keyboard/Bantam44/config.h
A keyboard/Bantam44/keymaps/default.c
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
M keyboard/atomic/atomic.c
M keyboard/atomic/atomic.h
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
M keyboard/atreus/atreus.c
M keyboard/atreus/atreus.h
R keyboard/atreus/keymaps/{keymap_default => default}.c
R keyboard/atreus/keymaps/{keymap_gerb => gerb}.c
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
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
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
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
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
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
A keyboard/ergodox_ez/keymaps/naps62/README.md
A keyboard/ergodox_ez/keymaps/naps62/ergodox_ez.hex
A keyboard/ergodox_ez/keymaps/naps62/keymap.c
A keyboard/ergodox_ez/keymaps/ordinary/keymap.c
A keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.png
A keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.txt
A keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.png
A keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.txt
A keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.png
A keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.txt
A keyboard/ergodox_ez/keymaps/ordinary/ordinary.hex
A keyboard/ergodox_ez/keymaps/ordinary/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/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/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
M keyboard/hhkb_qmk/hhkb_qmk.c
M keyboard/hhkb_qmk/hhkb_qmk.h
R keyboard/hhkb_qmk/keymaps/{keymap_default => default}.c
R keyboard/hhkb_qmk/keymaps/{keymap_lxol => lxol}.c
M keyboard/jd45/Makefile
M keyboard/jd45/jd45.c
M keyboard/jd45/jd45.h
R keyboard/jd45/keymaps/{keymap_default => default}.c
R keyboard/jd45/keymaps/{keymap_justin => justin}.c
A keyboard/planck/CYGWIN_GUIDE.md
M keyboard/planck/Makefile
M keyboard/planck/README.md
M keyboard/planck/keymaps/default/keymap.c
M keyboard/planck/keymaps/lock/keymap.c
A keyboard/planck/keymaps/tak3over.c
A 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/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
D keyboard/preonic/led.c
D keyboard/preonic/matrix.c
A keyboard/preonic/preonic.c
A keyboard/preonic/preonic.h
A keyboard/preonic/preonic_pcb.hex
A keyboard/preonic/preonic_pcb_silent.hex
A keyboard/retro_refit/Makefile
A keyboard/retro_refit/README.md
A keyboard/retro_refit/config.h
A keyboard/retro_refit/keymaps/default.c
A keyboard/retro_refit/retro_refit.c
A keyboard/retro_refit/retro_refit.h
M quantum/keymap_common.c
A quantum/keymap_extras/keymap_bepo.h
M quantum/keymap_extras/keymap_german_osx.h
M quantum/keymap_midi.c
M quantum/led.c
M quantum/matrix.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
D teensy-sdk
M tmk_core/common/action.c
M tmk_core/common/action.h
M tmk_core/common/action_macro.c
M tmk_core/common/action_util.c
M tmk_core/common/action_util.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
M tmk_core/common/led.h
M tmk_core/common/matrix.h
This diff is too large to display. Try viewing the raw diff instead.