~ruther/qmk_firmware

65645fb8cad05307b9faf9a897eefd5ae8c46dad — Tobias Matt 9 years ago 4122ad3 + 69f05e1
Merge remote-tracking branch 'upstream/master'
134 files changed, 23952 insertions(+), 10271 deletions(-)

M .gitignore
M BUILD_GUIDE.md
M README.md
M keyboard/atomic/Makefile
M keyboard/atomic/atomic.c
M keyboard/atomic/atomic.h
D keyboard/atomic/backlight.c
M keyboard/atomic/keymaps/pvc/config.h
M keyboard/atomic/keymaps/pvc/keymap.c
M keyboard/atomic/keymaps/pvc/makefile.mk
M keyboard/atreus/config.h
A keyboard/clueboard1/Makefile
A keyboard/clueboard1/clueboard1.c
A keyboard/clueboard1/clueboard1.h
A keyboard/clueboard1/config.h
A keyboard/clueboard1/keymaps/keymap_default.c
A keyboard/clueboard1/led.c
A keyboard/clueboard2/Makefile
A keyboard/clueboard2/backlight.c
A keyboard/clueboard2/clueboard2.c
A keyboard/clueboard2/clueboard2.h
A keyboard/clueboard2/config.h
A keyboard/clueboard2/keymaps/keymap_default.c
A keyboard/clueboard2/keymaps/keymap_max.c
A keyboard/clueboard2/keymaps/keymap_skully.c
A keyboard/clueboard2/led.c
A keyboard/cluepad/Makefile
A keyboard/cluepad/backlight.c
A keyboard/cluepad/cluepad.c
A keyboard/cluepad/cluepad.h
A keyboard/cluepad/config.h
A keyboard/cluepad/keymaps/keymap_default.c
M keyboard/ergodox_ez/Makefile
A keyboard/ergodox_ez/keymaps/ab/ab.hex
A keyboard/ergodox_ez/keymaps/ab/keyboard-layout.json
A keyboard/ergodox_ez/keymaps/ab/keyboard-layout.png
A keyboard/ergodox_ez/keymaps/ab/keymap.c
A keyboard/ergodox_ez/keymaps/ab/readme.md
A keyboard/ergodox_ez/keymaps/erez_experimental/config_user.h
M keyboard/ergodox_ez/keymaps/erez_experimental/erez_experimental.hex
M keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c
A keyboard/ergodox_ez/keymaps/erez_experimental/makefile.mk
M keyboard/ergodox_ez/keymaps/erez_experimental/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
A keyboard/ergodox_ez/keymaps/ordinary/ordinary-special.png
A keyboard/ergodox_ez/keymaps/ordinary/ordinary-special.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
A keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/keymap.c
A keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/readme.md
A keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/romanzolotarev-norman-osx.hex
A keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/romanzolotarev-norman-osx.png
A keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/keymap.c
A keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/readme.md
A keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/romanzolotarev-norman-qwerty-osx.hex
A keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/romanzolotarev-norman-qwerty-osx.png
A keyboard/ergodox_ez/keymaps/sneako/README.md
A keyboard/ergodox_ez/keymaps/sneako/keymap.c
A keyboard/ergodox_ez/keymaps/sneako/sneako.hex
A keyboard/ergodox_ez/keymaps/techtomas/keymap.c
A keyboard/ergodox_ez/keymaps/techtomas/readme.md
A keyboard/ergodox_ez/keymaps/techtomas/techtomas.hex
M keyboard/ergodox_ez/keymaps/twey/keymap.c
A keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c
A keyboard/ergodox_ez/keymaps/zweihander-osx/readme.markdown
A keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex
M keyboard/ergodox_ez/readme.md
A keyboard/gh60_rev_c/Makefile
A keyboard/gh60_rev_c/README.md
A keyboard/gh60_rev_c/config.h
A keyboard/gh60_rev_c/gh60.c
A keyboard/gh60_rev_c/gh60.h
A keyboard/gh60_rev_c/gh60revc.jpg
A keyboard/gh60_rev_c/keymaps/default.c
A keyboard/gh60_rev_c/pinout.txt
M keyboard/planck/Makefile
D keyboard/planck/backlight.c
M keyboard/planck/keymaps/default/keymap.c
A keyboard/planck/keymaps/experimental/README.md
A keyboard/planck/keymaps/experimental/keymap.c
A keyboard/planck/keymaps/experimental/makefile.mk
A keyboard/planck/keymaps/pvc/config.h
A keyboard/planck/keymaps/pvc/keymap.c
A keyboard/planck/keymaps/pvc/makefile.mk
D keyboard/planck/keymaps/pvc_planck.c
M keyboard/planck/planck.c
M keyboard/planck/planck.h
M keyboard/planck/planck_pcb_r4.hex
M keyboard/planck/planck_pcb_r4_w_bootloader.hex
M keyboard/preonic/Makefile
D keyboard/preonic/backlight.c
M keyboard/preonic/keymaps/default/keymap.c
M keyboard/preonic/preonic.c
M keyboard/preonic/preonic.h
M keyboard/preonic/preonic_pcb_r1.hex
M keyboard/preonic/preonic_pcb_r1_w_bootloader.hex
M new_project.sh
M quantum/audio/audio.c
M quantum/audio/audio.h
A quantum/audio/audio_pwm.c
A quantum/audio/luts.c
A quantum/audio/luts.h
D quantum/audio/vibrato_lut.h
M quantum/audio/voices.c
M quantum/audio/voices.h
M quantum/keymap_common.c
M quantum/keymap_common.h
M quantum/keymap_midi.h
M quantum/matrix.c
M quantum/quantum.mk
M quantum/rgblight.c
M quantum/template/Makefile
M quantum/template/template.c
M quantum/template/template.h
M quantum/tools/README.md
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_macro.c
M tmk_core/common/action_tapping.c
M tmk_core/common/action_util.c
M tmk_core/common/action_util.h
M tmk_core/common/backlight.c
M tmk_core/common/backlight.h
M tmk_core/common/command.c
M tmk_core/common/nodebug.h
M tmk_core/doc/keymap.md
M tmk_core/rules.mk
This diff is too large to display. Try viewing the raw diff instead.