~ruther/qmk_firmware

28f0b64e31b8c30a842dfd356421356cf0513177 — Roman Zolotarev 9 years ago fa2eedb + bf56838
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
110 files changed, 18629 insertions(+), 9261 deletions(-)

M 1-setup-path-win.bat
M 2-setup-environment-win.bat
M README.md
M keyboard/atomic/Makefile
M keyboard/atomic/atomic.c
M keyboard/atomic/atomic.h
M keyboard/atomic/backlight.c
M keyboard/atomic/config.h
M keyboard/atomic/keymaps/default.c
A keyboard/atomic/keymaps/pvc/config.h
A keyboard/atomic/keymaps/pvc/keymap.c
A keyboard/atomic/keymaps/pvc/makefile.mk
M keyboard/ergodox_ez/keymaps/erez_experimental/erez_experimental.hex
M keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c
M keyboard/ergodox_ez/keymaps/j3rn/keymap.c
M keyboard/ergodox_ez/keymaps/j3rn/readme.md
M keyboard/ergodox_ez/keymaps/ordinary/keymap.c
M keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.png
M keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.txt
M keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.png
M keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.txt
M keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.png
M keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.txt
M keyboard/ergodox_ez/keymaps/ordinary/ordinary.hex
M 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/readme.md
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
A keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/osx_de_adnw_koy_highres.png
A keyboard/ergodox_ez/keymaps/osx_de_experimental/keymap.c
A keyboard/ergodox_ez/keymaps/osx_de_experimental/osx_de_experimental_highres.png
A keyboard/ergodox_ez/keymaps/plums/keymap.c
A keyboard/ergodox_ez/keymaps/plums/plums.hex
A keyboard/ergodox_ez/keymaps/plums/plums.png
A keyboard/ergodox_ez/keymaps/plums/readme.md
A keyboard/ergodox_ez/keymaps/twey/keymap.c
A keyboard/ergodox_ez/keymaps/twey/readme.md
A keyboard/ergodox_ez/keymaps/twey/twey.hex
M keyboard/hhkb/rn42/rn42_task.c
M keyboard/planck/Makefile
M keyboard/planck/config.h
A keyboard/planck/keymaps/bone2planck.c
M keyboard/planck/keymaps/default/README.md
M keyboard/planck/keymaps/default/keymap.c
A keyboard/planck/keymaps/default/makefile.mk
A keyboard/planck/keymaps/nico.c
A keyboard/planck/keymaps/pvc_planck.c
M keyboard/planck/keymaps/tak3over.c
R keyboard/planck/{planck_pcb => planck_pcb_r3}.hex
R keyboard/planck/{planck_with_bootloader => planck_pcb_r3_w_bootloader}.hex
A keyboard/planck/planck_pcb_r4.hex
A keyboard/planck/planck_pcb_r4_w_bootloader.hex
M keyboard/preonic/Makefile
M keyboard/preonic/config.h
M keyboard/preonic/keymaps/default/README.md
M keyboard/preonic/keymaps/default/keymap.c
A keyboard/preonic/keymaps/default/makefile.mk
D keyboard/preonic/preonic_music.hex
R keyboard/preonic/{preonic_pcb => preonic_pcb_r1}.hex
A keyboard/preonic/preonic_pcb_r1_w_bootloader.hex
D keyboard/preonic/preonic_pcb_silent.hex
M keyboard/retro_refit/retro_refit.c
D quantum/audio.c
D quantum/audio.h
A quantum/audio/audio.c
A quantum/audio/audio.h
A quantum/audio/frequency_lut.h
A quantum/audio/musical_notes.h
A quantum/audio/song_list.h
A quantum/audio/vibrato_lut.h
A quantum/audio/voices.c
A quantum/audio/voices.h
R quantum/{ => audio}/wave.h
M quantum/keymap_common.c
M quantum/keymap_common.h
M quantum/keymap_extras/keymap_german_osx.h
A quantum/keymap_extras/keymap_plover.h
M quantum/keymap_midi.h
M quantum/led.c
M quantum/quantum.mk
M quantum/rgblight.c
M quantum/rgblight.h
A quantum/tools/README.md
A quantum/tools/eeprom_reset.hex
M tmk_core/common.mk
M tmk_core/common/action.c
M tmk_core/common/action_code.h
M tmk_core/common/action_layer.c
M tmk_core/common/action_layer.h
M tmk_core/common/action_macro.c
M tmk_core/common/action_tapping.c
M tmk_core/common/avr/eeconfig.c
M tmk_core/common/avr/suspend.c
M tmk_core/common/backlight.c
M tmk_core/common/bootmagic.c
M tmk_core/common/command.c
M tmk_core/common/eeconfig.h
M tmk_core/common/keyboard.c
M tmk_core/common/keymap.c
M tmk_core/common/keymap.h
A tmk_core/common/magic.c
A tmk_core/common/magic.h
M tmk_core/common/print.h
M tmk_core/protocol/lufa.mk
M tmk_core/protocol/lufa/LUFA-git/Bootloaders/CDC/BootloaderCDC.c
M tmk_core/protocol/lufa/LUFA-git/Bootloaders/DFU/BootloaderDFU.c
M tmk_core/protocol/lufa/lufa.c
This diff is too large to display. Try viewing the raw diff instead.