summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDrashna Jael're <drashna@live.com>2021-12-08 08:17:55 -0800
committerDrashna Jael're <drashna@live.com>2021-12-08 08:17:55 -0800
commitaf936c6ae6b88e451dd1ec8a3a835d83d5e376ba (patch)
treec0c46fd8bd910b469530f96f75fbde3aa213d6ca
parent26febb7c24581d5c91e188362684aee1f31edf1b (diff)
parentcf9239a88277b0fbdd6de184374c6c84c39d8d8f (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--docs/flashing.md2
-rw-r--r--keyboards/30wer/rules.mk3
-rw-r--r--keyboards/40percentclub/nano/rules.mk3
-rw-r--r--keyboards/6ball/rules.mk3
-rw-r--r--keyboards/7skb/rules.mk3
-rw-r--r--keyboards/9key/rules.mk3
-rw-r--r--keyboards/adkb96/rules.mk3
-rw-r--r--keyboards/atreus62/rules.mk3
-rw-r--r--keyboards/boardwalk/rules.mk5
-rw-r--r--keyboards/bpiphany/frosty_flake/keymaps/default/rules.mk4
-rw-r--r--keyboards/bpiphany/frosty_flake/keymaps/tkl/rules.mk4
-rw-r--r--keyboards/bpiphany/pegasushoof/keymaps/default/rules.mk4
-rw-r--r--keyboards/bpiphany/pegasushoof/keymaps/default_jis/rules.mk4
-rw-r--r--keyboards/bpiphany/tiger_lily/keymaps/default/rules.mk4
-rw-r--r--keyboards/bpiphany/tiger_lily/keymaps/default_ansi/rules.mk4
-rw-r--r--keyboards/christmas_tree/rules.mk3
-rw-r--r--keyboards/claw44/rules.mk3
-rw-r--r--keyboards/clueboard/card/keymaps/default/rules.mk4
-rw-r--r--keyboards/clueboard/card/keymaps/rgb_effects/rules.mk4
-rw-r--r--keyboards/contender/config.h148
-rw-r--r--keyboards/contender/contender.c17
-rw-r--r--keyboards/contender/contender.h43
-rw-r--r--keyboards/contender/info.json37
-rw-r--r--keyboards/contender/keymaps/default/config.h19
-rw-r--r--keyboards/contender/keymaps/default/keymap.c111
-rw-r--r--keyboards/contender/keymaps/default/readme.md1
-rw-r--r--keyboards/contender/readme.md26
-rw-r--r--keyboards/contender/rules.mk19
-rw-r--r--keyboards/converter/hp_46010a/rules.mk3
-rw-r--r--keyboards/converter/ibm_terminal/keymaps/default/rules.mk4
-rw-r--r--keyboards/converter/ibm_terminal/rules.mk3
-rw-r--r--keyboards/converter/palm_usb/rules.mk3
-rw-r--r--keyboards/converter/sun_usb/rules.mk3
-rw-r--r--keyboards/cu75/keymaps/default/rules.mk5
-rw-r--r--keyboards/cu75/keymaps/iso/rules.mk5
-rw-r--r--keyboards/eco/keymaps/default/rules.mk6
-rw-r--r--keyboards/eco/rules.mk3
-rw-r--r--keyboards/emptystring/NQG/rules.mk3
-rw-r--r--keyboards/ergodash/rules.mk3
-rw-r--r--keyboards/ergoslab/rules.mk3
-rw-r--r--keyboards/ergotravel/rules.mk3
-rw-r--r--keyboards/evil80/rules.mk3
-rw-r--r--keyboards/gh60/satan/keymaps/default/rules.mk4
-rw-r--r--keyboards/handwired/atreus50/rules.mk3
-rw-r--r--keyboards/handwired/dactyl_promicro/rules.mk3
-rw-r--r--keyboards/handwired/daishi/rules.mk5
-rw-r--r--keyboards/handwired/ddg_56/rules.mk3
-rw-r--r--keyboards/handwired/jot50/rules.mk4
-rw-r--r--keyboards/handwired/jotanck/rules.mk4
-rw-r--r--keyboards/handwired/jotpad16/rules.mk4
-rw-r--r--keyboards/handwired/kbod/keymaps/default/rules.mk4
-rw-r--r--keyboards/handwired/lovelive9/rules.mk3
-rw-r--r--keyboards/handwired/minorca/keymaps/readme.md23
-rw-r--r--keyboards/handwired/ms_sculpt_mobile/keymaps/default/rules.mk4
-rw-r--r--keyboards/handwired/pilcrow/keymaps/default/rules.mk4
-rw-r--r--keyboards/handwired/promethium/keymaps/default/rules.mk6
-rw-r--r--keyboards/handwired/promethium/keymaps/readme.md22
-rw-r--r--keyboards/handwired/promethium/rules.mk3
-rw-r--r--keyboards/handwired/qc60/rules.mk3
-rw-r--r--keyboards/handwired/splittest/rules.mk3
-rw-r--r--keyboards/handwired/xealous/rules.mk3
-rw-r--r--keyboards/helix/pico/keymaps/default/rules.mk7
-rw-r--r--keyboards/helix/rev2/keymaps/default/rules.mk7
-rw-r--r--keyboards/helix/rev2/keymaps/five_rows/rules.mk7
-rw-r--r--keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk7
-rw-r--r--keyboards/helix/rev3_5rows/keymaps/five_rows/rules.mk6
-rw-r--r--keyboards/helix/rules.mk5
-rw-r--r--keyboards/hifumi/rules.mk3
-rw-r--r--keyboards/ivy/rules.mk3
-rw-r--r--keyboards/keebio/bfo9000/rules.mk3
-rw-r--r--keyboards/keebio/fourier/rules.mk3
-rw-r--r--keyboards/keebio/iris/rev1/rules.mk4
-rw-r--r--keyboards/keebio/iris/rev1_led/rules.mk4
-rw-r--r--keyboards/keebio/iris/rev2/rules.mk4
-rw-r--r--keyboards/keebio/iris/rev3/rules.mk4
-rw-r--r--keyboards/keebio/iris/rev4/rules.mk4
-rw-r--r--keyboards/keebio/laplace/rules.mk3
-rw-r--r--keyboards/keebio/levinson/rules.mk3
-rw-r--r--keyboards/keebio/nyquist/rev1/rules.mk3
-rw-r--r--keyboards/keebio/nyquist/rev2/rules.mk3
-rw-r--r--keyboards/keebio/nyquist/rev3/rules.mk3
-rw-r--r--keyboards/keebio/viterbi/rules.mk3
-rw-r--r--keyboards/keebio/wavelet/rules.mk3
-rw-r--r--keyboards/kinesis/keymaps/default/rules.mk4
-rw-r--r--keyboards/kinesis/keymaps/default_pretty/rules.mk4
-rw-r--r--keyboards/kona_classic/keymaps/ansi/rules.mk20
-rw-r--r--keyboards/kona_classic/keymaps/ansi_arrows/rules.mk20
-rw-r--r--keyboards/kona_classic/keymaps/ansi_arrows_lcap/rules.mk20
-rw-r--r--keyboards/kona_classic/keymaps/ansi_split/rules.mk20
-rw-r--r--keyboards/kona_classic/keymaps/ansi_split_arrows/rules.mk20
-rw-r--r--keyboards/kona_classic/keymaps/default/rules.mk20
-rw-r--r--keyboards/kona_classic/keymaps/iso/rules.mk20
-rw-r--r--keyboards/kona_classic/keymaps/iso_arrows/rules.mk20
-rw-r--r--keyboards/kona_classic/keymaps/iso_split/rules.mk20
-rw-r--r--keyboards/kona_classic/keymaps/iso_split_arrows/rules.mk20
-rw-r--r--keyboards/laptreus/rules.mk3
-rw-r--r--keyboards/launchpad/rules.mk3
-rw-r--r--keyboards/lets_split/rules.mk3
-rw-r--r--keyboards/lets_split_eh/rules.mk3
-rw-r--r--keyboards/lfkeyboards/lfk78/keymaps/ca178858/rules.mk5
-rw-r--r--keyboards/lfkeyboards/lfk87/keymaps/ca178858/rules.mk5
-rw-r--r--keyboards/lfkeyboards/lfk87/keymaps/default/rules.mk5
-rw-r--r--keyboards/lfkeyboards/lfk87/keymaps/gbchk/rules.mk5
-rw-r--r--keyboards/lfkeyboards/lfk87/keymaps/iso/rules.mk5
-rw-r--r--keyboards/lfkeyboards/lfk87/rules.mk4
-rw-r--r--keyboards/lfkeyboards/mini1800/keymaps/ca178858/rules.mk5
-rw-r--r--keyboards/lfkeyboards/mini1800/keymaps/default/rules.mk5
-rw-r--r--keyboards/lily58/keymaps/default/rules.mk4
-rw-r--r--keyboards/lily58/rules.mk3
-rw-r--r--keyboards/maxr1998/phoebe/rules.mk3
-rw-r--r--keyboards/maxr1998/pulse4k/rules.mk3
-rw-r--r--keyboards/newgame40/rules.mk3
-rw-r--r--keyboards/niu_mini/keymaps/readme.md25
-rw-r--r--keyboards/niu_mini/rules.mk3
-rw-r--r--keyboards/orthodox/rules.mk3
-rw-r--r--keyboards/planck/ez/rules.mk3
-rw-r--r--keyboards/planck/keymaps/readme.md23
-rw-r--r--keyboards/planck/light/rules.mk3
-rw-r--r--keyboards/planck/rev1/rules.mk3
-rw-r--r--keyboards/planck/rev2/rules.mk3
-rw-r--r--keyboards/planck/rev3/rules.mk3
-rw-r--r--keyboards/planck/rev4/rules.mk3
-rw-r--r--keyboards/planck/rev5/rules.mk3
-rw-r--r--keyboards/planck/rev6/rules.mk3
-rw-r--r--keyboards/preonic/rev1/rules.mk3
-rw-r--r--keyboards/preonic/rev2/rules.mk3
-rw-r--r--keyboards/preonic/rev3/rules.mk3
-rw-r--r--keyboards/puck/rules.mk3
-rw-r--r--keyboards/qwertyydox/rules.mk3
-rw-r--r--keyboards/rgbkb/mun/rules.mk4
-rw-r--r--keyboards/rgbkb/zen/rules.mk3
-rw-r--r--keyboards/rgbkb/zygomorph/keymaps/5x6pad/rules.mk5
-rw-r--r--keyboards/rgbkb/zygomorph/keymaps/default/rules.mk5
-rw-r--r--keyboards/rgbkb/zygomorph/keymaps/default_oled/rules.mk5
-rw-r--r--keyboards/subatomic/rules.mk3
-rw-r--r--keyboards/touchpad/rules.mk3
-rw-r--r--keyboards/treadstone32/keymaps/default/rules.mk5