]> git.donarmstrong.com Git - qmk_firmware.git/commit
merge upstream
authorcoderkun <olli@coderkun.de>
Fri, 15 Jan 2016 19:19:45 +0000 (20:19 +0100)
committercoderkun <olli@coderkun.de>
Fri, 15 Jan 2016 19:19:45 +0000 (20:19 +0100)
commitbd9aebc84a8b14d861244775e339a9bd36c69d22
tree30d273684775c2c4dcc254f4e5eb8c1cf4bf6548
parent57bf227f6de9eac4dd3ae8f83fa75545de3b1d4e
merge upstream
16 files changed:
keyboard/ergodox_ez/Makefile
keyboard/ergodox_ez/keymaps/keymap_default.hex
keyboard/ergodox_ez/keymaps/keymap_default_osx.png [deleted file]
keyboard/ergodox_ez/keymaps/keymap_osx_de.c
keyboard/ergodox_ez/keymaps/keymap_osx_de.hex
keyboard/ergodox_ez/keymaps/keymap_osx_de_adnw_koy.c [new file with mode: 0644]
keyboard/ergodox_ez/keymaps/keymap_osx_de_highres.png
keyboard/hhkb_qmk/Makefile [new file with mode: 0644]
keyboard/hhkb_qmk/README.md [new file with mode: 0644]
keyboard/hhkb_qmk/config.h [new file with mode: 0644]
keyboard/hhkb_qmk/hhkb_avr.h [new file with mode: 0644]
keyboard/hhkb_qmk/hhkb_qmk.c [new file with mode: 0644]
keyboard/hhkb_qmk/hhkb_qmk.h [new file with mode: 0644]
keyboard/hhkb_qmk/keymaps/keymap_default.c [new file with mode: 0644]
keyboard/hhkb_qmk/keymaps/keymap_lxol.c [new file with mode: 0644]
keyboard/hhkb_qmk/matrix.c [new file with mode: 0644]