summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien <Dbroqua@users.noreply.github.com>2017-05-26 15:57:08 +0200
committerGitHub <noreply@github.com>2017-05-26 15:57:08 +0200
commit0a4a966c6648e66a1129ae3af36639054d3e0ed3 (patch)
treeec50b19b9031b1f3f24e003879f95cf9690d61af
parent7180e195e84aabf252fcadb2852644417ac1d663 (diff)
parent7a4ec3bd926865e490fbf7c5ec68d762e998683f (diff)
Merge pull request #22 from qmk/master
Merge from QMK
-rw-r--r--Dockerfile9
-rw-r--r--keyboards/amj60/amj60.h15
-rw-r--r--keyboards/amj60/keymaps/maximized/keymap.c61
-rw-r--r--keyboards/atomic/keymaps/pvc/keymap.c4
-rw-r--r--keyboards/atreus/keymaps/xyverz/keymap.c10
-rw-r--r--keyboards/atreus62/keymaps/xyverz/keymap.c10
-rw-r--r--keyboards/clueboard/keymaps/mac_optimized/keymap.c21
-rw-r--r--keyboards/clueboard/keymaps/shift_fn/keymap.c2
-rw-r--r--keyboards/clueboard/keymaps/skully/keymap.c2
-rw-r--r--keyboards/clueboard/keymaps/smt/keymap.c181
-rw-r--r--keyboards/clueboard/keymaps/smt/layout.pngbin0 -> 130672 bytes
-rw-r--r--keyboards/clueboard/keymaps/smt/readme.md30
-rw-r--r--keyboards/converter/ibm_terminal/keymaps/priyadi/keymap.c10
-rw-r--r--keyboards/ergodox/config.h4
-rw-r--r--keyboards/ergodox/ez/config.h2
-rw-r--r--keyboards/ergodox/ez/matrix.c62
-rw-r--r--keyboards/ergodox/keymaps/coderkun_neo2/keymap.c53
-rw-r--r--keyboards/ergodox/keymaps/coderkun_neo2/readme.md122
-rw-r--r--keyboards/ergodox/keymaps/dvorak_programmer_swe/keymap.c331
-rw-r--r--keyboards/ergodox/keymaps/dvorak_programmer_swe/readme.md28
-rw-r--r--keyboards/ergodox/keymaps/xyverz/keymap.c8
-rw-r--r--keyboards/frosty_flake/keymaps/nikchi/Makefile23
-rw-r--r--keyboards/frosty_flake/keymaps/nikchi/config.h24
-rw-r--r--keyboards/frosty_flake/keymaps/nikchi/keymap.c224
-rw-r--r--keyboards/frosty_flake/keymaps/nikchi/readme.md24
-rw-r--r--keyboards/frosty_flake/rules.mk4
-rw-r--r--keyboards/gh60/keymaps/xyverz/keymap.c8
-rw-r--r--keyboards/handwired/atreus50/keymaps/default/keymap.c8
-rw-r--r--keyboards/handwired/ortho5x13/keymaps/default/keymap.c8
-rw-r--r--keyboards/handwired/promethium/color.h15
-rw-r--r--keyboards/handwired/promethium/config.h44
-rw-r--r--keyboards/handwired/promethium/keymaps/priyadi/config.h1
-rw-r--r--keyboards/handwired/promethium/keymaps/priyadi/keymap.c169
-rw-r--r--keyboards/handwired/promethium/keymaps/priyadi/rgbtheme.h1
-rw-r--r--keyboards/handwired/promethium/keymaps/priyadi/rgbtheme_carbon.h36
-rw-r--r--keyboards/handwired/promethium/keymaps/priyadi/rgbtheme_default.h36
-rw-r--r--keyboards/handwired/promethium/matrix.c4
-rw-r--r--keyboards/handwired/promethium/promethium.c6
-rw-r--r--keyboards/hhkb/keymaps/cinaeco/Makefile23
-rw-r--r--keyboards/hhkb/keymaps/cinaeco/README.md23
-rw-r--r--keyboards/hhkb/keymaps/cinaeco/config.h20
-rw-r--r--keyboards/hhkb/keymaps/cinaeco/keymap.c186
-rw-r--r--keyboards/hhkb/keymaps/smt/keymap.c8
-rw-r--r--keyboards/hhkb/rules.mk2
-rw-r--r--keyboards/jd45/keymaps/jeebak/keymap.c2
-rw-r--r--keyboards/jd45/keymaps/jeebak/readme.md2
-rw-r--r--keyboards/kinesis/keymaps/xyverz/keymap.c8
-rw-r--r--keyboards/lets_split/keymaps/OLED_sample/keymap.c8
-rw-r--r--keyboards/lets_split/keymaps/hexwire/keymap.c8
-rw-r--r--keyboards/lets_split/keymaps/i2c/keymap.c8
-rw-r--r--keyboards/lets_split/keymaps/serial/keymap.c8
-rw-r--r--keyboards/lets_split/keymaps/smt/keymap.c8
-rw-r--r--keyboards/lets_split/keymaps/xyverz/keymap.c8
-rw-r--r--keyboards/m10a/Makefile (renamed from keyboards/M10A/Makefile)0
-rw-r--r--keyboards/m10a/config.h (renamed from keyboards/M10A/config.h)0
-rw-r--r--keyboards/m10a/keymaps/default/Makefile (renamed from keyboards/M10A/keymaps/default/Makefile)0
-rw-r--r--keyboards/m10a/keymaps/default/keymap.c (renamed from keyboards/M10A/keymaps/default/keymap.c)2
-rw-r--r--keyboards/m10a/m10a.c (renamed from keyboards/M10A/M10A.c)2
-rw-r--r--keyboards/m10a/m10a.h (renamed from keyboards/M10A/M10A.h)0
-rw-r--r--keyboards/m10a/rules.mk (renamed from keyboards/M10A/rules.mk)0
-rw-r--r--keyboards/miuni32/config.h1
-rw-r--r--keyboards/miuni32/keymaps/adam-lee/Makefile21
-rw-r--r--keyboards/miuni32/keymaps/adam-lee/config.h8
-rw-r--r--keyboards/miuni32/keymaps/adam-lee/keymap.c119
-rw-r--r--keyboards/miuni32/keymaps/adam-lee/readme.md1
-rw-r--r--keyboards/miuni32/keymaps/default/keymap.c104
-rw-r--r--keyboards/miuni32/keymaps/ht_156/Makefile21
-rw-r--r--keyboards/miuni32/keymaps/ht_156/config.h8
-rw-r--r--keyboards/miuni32/keymaps/ht_156/keymap.c181
-rw-r--r--keyboards/miuni32/keymaps/ht_156/readme.md1
-rw-r--r--keyboards/miuni32/miuni32.h4
-rw-r--r--keyboards/phantom/keymaps/xyverz/keymap.c8
-rw-r--r--keyboards/planck/keymaps/ab/keymap.c4
-rw-r--r--keyboards/planck/keymaps/dbroqua/keymap.c4
-rw-r--r--keyboards/planck/keymaps/default/keymap.c8
-rw-r--r--keyboards/planck/keymaps/dshields/Makefile12
-rw-r--r--keyboards/planck/keymaps/dshields/config.h31
-rw-r--r--keyboards/planck/keymaps/dshields/keyboard-layout.jpgbin0 -> 50615 bytes
-rw-r--r--keyboards/planck/keymaps/dshields/keymap.c100
-rw-r--r--keyboards/planck/keymaps/dshields/readme.md12
-rw-r--r--keyboards/planck/keymaps/espynn/keymap.c4
-rw-r--r--keyboards/planck/keymaps/experimental/keymap.c8
-rw-r--r--keyboards/planck/keymaps/impossible/keymap.c8
-rw-r--r--keyboards/planck/keymaps/jeebak/keymap.c2
-rw-r--r--keyboards/planck/keymaps/jeebak/readme.md2
-rw-r--r--keyboards/planck/keymaps/jhenahan/keymap.c6
-rw-r--r--keyboards/planck/keymaps/khord/keymap.c8
-rw-r--r--keyboards/planck/keymaps/pete/keymap.c8
-rw-r--r--keyboards/planck/keymaps/premek/keymap.c8
-rw-r--r--keyboards/planck/keymaps/pvc/keymap.c4
-rw-r--r--keyboards/planck/keymaps/sgoodwin/keymap.c6
-rw-r--r--keyboards/planck/keymaps/smt/keymap.c8
-rw-r--r--keyboards/planck/keymaps/thermal_printer/keymap.c8
-rw-r--r--keyboards/planck/keymaps/unicode/keymap.c8
-rw-r--r--keyboards/planck/keymaps/vifon/keymap.c3
-rw-r--r--keyboards/planck/keymaps/xyverz/keymap.c8
-rw-r--r--keyboards/planck/keymaps/zach/zach_common_functions.c6
-rw-r--r--keyboards/preonic/keymaps/0xdec/keymap.c6
-rw-r--r--keyboards/preonic/keymaps/CMD-Preonic/keymap.c14
-rw-r--r--keyboards/preonic/keymaps/default/keymap.c8
-rw-r--r--keyboards/preonic/keymaps/jacwib/keymap.c6
-rw-r--r--keyboards/preonic/keymaps/kinesis/keymap.c2
-rw-r--r--keyboards/preonic/keymaps/nikchi/Makefile3
-rw-r--r--keyboards/preonic/keymaps/nikchi/config.h29
-rw-r--r--keyboards/preonic/keymaps/nikchi/keymap.c221
-rw-r--r--keyboards/preonic/keymaps/nikchi/readme.md1
-rw-r--r--keyboards/preonic/keymaps/smt/keymap.c8
-rw-r--r--keyboards/preonic/keymaps/xyverz/keymap.c8
-rw-r--r--keyboards/preonic/keymaps/zach/zach_common_functions.c6
-rw-r--r--keyboards/ps2avrGB/keymaps/default/keymap.c16
-rw-r--r--keyboards/ps2avrGB/ps2avrGB.h18
-rw-r--r--keyboards/roadkit/keymaps/default/keymap.c4
-rw-r--r--keyboards/roadkit/keymaps/singles/keymap.c6
-rw-r--r--keyboards/s60-x/s60-x.c1
-rw-r--r--keyboards/s60-x/s60-x_precompiled.zipbin276106 -> 0 bytes
-rw-r--r--keyboards/s60_x/Makefile (renamed from keyboards/s60-x/Makefile)0
-rw-r--r--keyboards/s60_x/config.h (renamed from keyboards/s60-x/config.h)13
-rw-r--r--keyboards/s60_x/default/Makefile (renamed from keyboards/s60-x/default/Makefile)0
-rw-r--r--keyboards/s60_x/default/config.h (renamed from keyboards/s60-x/default/config.h)0
-rw-r--r--keyboards/s60_x/default/default.c (renamed from keyboards/s60-x/default/default.c)0
-rw-r--r--keyboards/s60_x/default/default.h (renamed from keyboards/s60-x/default/default.h)0
-rw-r--r--keyboards/s60_x/default/rules.mk (renamed from keyboards/s60-x/default/rules.mk)0
-rw-r--r--keyboards/s60_x/keymaps/ansi_qwertz/Makefile (renamed from keyboards/s60-x/keymaps/ansi_qwertz/Makefile)0
-rw-r--r--keyboards/s60_x/keymaps/ansi_qwertz/config.h (renamed from keyboards/s60-x/keymaps/ansi_qwertz/config.h)0
-rw-r--r--keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.png (renamed from keyboards/s60-x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.png)bin54748 -> 54748 bytes
-rw-r--r--keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.svg (renamed from keyboards/s60-x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.svg)0
-rw-r--r--keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.svg.2016_08_18_09_06_36.0.svg (renamed from keyboards/s60-x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.svg.2016_08_18_09_06_36.0.svg)0
-rw-r--r--keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International.png (renamed from keyboards/s60-x/keymaps/ansi_qwertz/docs/KB_US-International.png)bin54041 -> 54041 bytes
-rw-r--r--keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International.svg (renamed from keyboards/s60-x/keymaps/ansi_qwertz/docs/KB_US-International.svg)0
-rw-r--r--keyboards/s60_x/keymaps/ansi_qwertz/docs/base_layer.PNG (renamed from keyboards/s60-x/keymaps/ansi_qwertz/docs/base_layer.PNG)