Merge remote-tracking branch 'origin/master' into develop
203 files changed, 15424 insertions(+), 4172 deletions(-) A keyboards/boardsource/lulu/keymaps/rmeli/config.h A keyboards/boardsource/lulu/keymaps/rmeli/keymap.c A keyboards/boardsource/lulu/keymaps/rmeli/rules.mk A keyboards/cannonkeys/serenity/config.h A keyboards/cannonkeys/serenity/halconf.h A keyboards/cannonkeys/serenity/info.json A keyboards/cannonkeys/serenity/keymaps/default/keymap.c A keyboards/cannonkeys/serenity/keymaps/via/keymap.c A keyboards/cannonkeys/serenity/keymaps/via/rules.mk A keyboards/cannonkeys/serenity/mcuconf.h A keyboards/cannonkeys/serenity/readme.md A keyboards/cannonkeys/serenity/rules.mk M keyboards/crkbd/keymaps/ericgebhart/keymap.c -rwxr-xr-x => -rw-r--r-- M keyboards/crkbd/keymaps/rmeli/config.h M keyboards/crkbd/keymaps/rmeli/keymap.c M keyboards/crkbd/keymaps/rmeli/rules.mk M keyboards/dztech/dz60rgb_ansi/v1/rules.mk M keyboards/dztech/dz60rgb_ansi/v2/rules.mk M keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk M keyboards/ergodox_ez/keymaps/ericgebhart/keymap.c D keyboards/ergodox_ez/keymaps/ericgebhart/layouts.h A keyboards/handwired/alcor_dactyl/config.h A keyboards/handwired/alcor_dactyl/info.json A keyboards/handwired/alcor_dactyl/keymaps/colemak_dh/keymap.c A keyboards/handwired/alcor_dactyl/keymaps/default/keymap.c A keyboards/handwired/alcor_dactyl/readme.md A keyboards/handwired/alcor_dactyl/rules.mk A keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.c A keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.h A keyboards/handwired/dactyl_manuform/5x6_6/config.h A keyboards/handwired/dactyl_manuform/5x6_6/info.json A keyboards/handwired/dactyl_manuform/5x6_6/keymaps/default/keymap.c A keyboards/handwired/dactyl_manuform/5x6_6/readme.md A keyboards/handwired/dactyl_manuform/5x6_6/rules.mk M keyboards/keebio/viterbi/keymaps/ericgebhart/keymap.c M keyboards/kinesis/keymaps/ericgebhart/keymap.c M keyboards/kinesis/keymaps/ericgebhart/rules.mk A keyboards/laser_ninja/pumpkin_pad/config.h A keyboards/laser_ninja/pumpkin_pad/info.json A keyboards/laser_ninja/pumpkin_pad/keymaps/default/keymap.c A keyboards/laser_ninja/pumpkin_pad/keymaps/via/keymap.c A keyboards/laser_ninja/pumpkin_pad/keymaps/via/rules.mk A keyboards/laser_ninja/pumpkin_pad/readme.md A keyboards/laser_ninja/pumpkin_pad/rules.mk M keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/keymap.c D keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/layouts.h M keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/rules.mk A keyboards/nixkeyboards/day_off/config.h A keyboards/nixkeyboards/day_off/day_off.c A keyboards/nixkeyboards/day_off/day_off.h A keyboards/nixkeyboards/day_off/info.json A keyboards/nixkeyboards/day_off/keymaps/default/keymap.c A keyboards/nixkeyboards/day_off/readme.md A keyboards/nixkeyboards/day_off/rules.mk A keyboards/preonic/keymaps/rmeli/config.h A keyboards/preonic/keymaps/rmeli/keymap.c A keyboards/preonic/keymaps/rmeli/readme.md A keyboards/preonic/keymaps/rmeli/rules.mk A keyboards/splitkb/kyria/keymaps/ericgebhart/config.h A keyboards/splitkb/kyria/keymaps/ericgebhart/keymap.c A keyboards/splitkb/kyria/keymaps/ericgebhart/rules.mk M keyboards/xiudi/xd75/keymaps/ericgebhart/keymap.c D keyboards/xiudi/xd75/keymaps/ericgebhart/readme.md M keyboards/xiudi/xd75/keymaps/ericgebhart/rules.mk A users/ericgebhart/base_layers/accents.h A users/ericgebhart/base_layers/alt.h A users/ericgebhart/base_layers/base_layers.h A users/ericgebhart/base_layers/beakl.h A users/ericgebhart/base_layers/bepo.h A users/ericgebhart/base_layers/carpalx.h A users/ericgebhart/base_layers/dvorak.h A users/ericgebhart/base_layers/gap.h A users/ericgebhart/base_layers/hands_down.h A users/ericgebhart/base_layers/keymaps.txt A users/ericgebhart/base_layers/maks.h A users/ericgebhart/base_layers/qwerty.h A users/ericgebhart/base_layers/toprows.h D users/ericgebhart/caps_word.c D users/ericgebhart/caps_word.h D users/ericgebhart/combos.def M users/ericgebhart/config.h -rwxr-xr-x => -rw-r--r-- D users/ericgebhart/core_keys.h D users/ericgebhart/core_keysets.h A users/ericgebhart/defs/accented_keys.def A users/ericgebhart/defs/alt_shift.def A users/ericgebhart/defs/altlocal_keys.def A users/ericgebhart/defs/combos.def A users/ericgebhart/defs/custom_keys.def A users/ericgebhart/defs/encoders.def A users/ericgebhart/defs/key_overrides.def A users/ericgebhart/defs/mod_lock.def A users/ericgebhart/defs/not_dead.def A users/ericgebhart/defs/nshot.def A users/ericgebhart/defs/oneshot.def A users/ericgebhart/defs/send_string.def A users/ericgebhart/defs/smart_lock.def A users/ericgebhart/defs/swapper.def A users/ericgebhart/defs/tap_hold.def A users/ericgebhart/defs/unicode.def D users/ericgebhart/edge_keys.h M users/ericgebhart/ericgebhart.c M users/ericgebhart/ericgebhart.h A users/ericgebhart/extensions/accented_keys.c R users/ericgebhart/{tap_dances => extensions/accented_keys}.h -rwxr-xr-x => -rw-r--r-- A users/ericgebhart/extensions/alt_shift.c R users/ericgebhart/{ => extensions}/altlocal_keys.c -rwxr-xr-x => -rw-r--r-- R users/ericgebhart/{ => extensions}/altlocal_keys.h A users/ericgebhart/extensions/console_key_logger.c A users/ericgebhart/extensions/console_key_logger.h A users/ericgebhart/extensions/encoders.c A users/ericgebhart/extensions/encoders.h A users/ericgebhart/extensions/extensions.c A users/ericgebhart/extensions/extensions.h A users/ericgebhart/extensions/key_overrides.h A users/ericgebhart/extensions/keycodes.h A users/ericgebhart/extensions/keymap_combo.h A users/ericgebhart/extensions/mod_lock.c A users/ericgebhart/extensions/mod_lock.h A users/ericgebhart/extensions/not_dead.c A users/ericgebhart/extensions/nshot_mod.c A users/ericgebhart/extensions/nshot_mod.h A users/ericgebhart/extensions/oneshot.c A users/ericgebhart/extensions/oneshot.h A users/ericgebhart/extensions/process_locales.h A users/ericgebhart/extensions/process_nshot.h A users/ericgebhart/extensions/process_smart_lock.h A users/ericgebhart/extensions/quick_tap.c A users/ericgebhart/extensions/send_string.c A users/ericgebhart/extensions/smart_lock.c A users/ericgebhart/extensions/smart_lock.h A users/ericgebhart/extensions/swapper.c A users/ericgebhart/extensions/swapper.h R users/ericgebhart/{ => extensions}/tap_dances.c R users/ericgebhart/{oled_stuff => extensions/tap_dances}.h A users/ericgebhart/extensions/tap_hold.c A users/ericgebhart/extensions/tap_hold.h A users/ericgebhart/extensions/unicode.c A users/ericgebhart/extensions/unicode.h D users/ericgebhart/flash-ergodox A users/ericgebhart/keyboards/keyboards.h A users/ericgebhart/keyboards/layouts.h A users/ericgebhart/keymap/keymap.c A users/ericgebhart/keymap/map_accented.h A users/ericgebhart/keymap/map_alt.h A users/ericgebhart/keymap/map_beakl.h A users/ericgebhart/keymap/map_bepo.h A users/ericgebhart/keymap/map_carpalx.h A users/ericgebhart/keymap/map_dvorak.h A users/ericgebhart/keymap/map_funcs.h A users/ericgebhart/keymap/map_gap.h A users/ericgebhart/keymap/map_hd.h A users/ericgebhart/keymap/map_keypads.h A users/ericgebhart/keymap/map_maks.h A users/ericgebhart/keymap/map_qwerty.h A users/ericgebhart/keymap/map_symbols.h A users/ericgebhart/keymap/map_toprows.h A users/ericgebhart/lang/lang.h A users/ericgebhart/lang/lang_map.h A users/ericgebhart/lang/locale_layers.h A users/ericgebhart/lang/locales.c A users/ericgebhart/lang/locales.h A users/ericgebhart/layer_names/base_names.h A users/ericgebhart/layer_names/func_names.h A users/ericgebhart/layer_names/layer_names.h A users/ericgebhart/layer_names/util_names.h D users/ericgebhart/layers.h A users/ericgebhart/layers/edge_keys.h A users/ericgebhart/layers/keypads.h A users/ericgebhart/layers/layers.h A users/ericgebhart/layers/nav.h A users/ericgebhart/layers/symbols.h A users/ericgebhart/layers/thumbs.h A users/ericgebhart/layers/toprows.h A users/ericgebhart/layers/utility.h D users/ericgebhart/layouts.h A users/ericgebhart/listen_keylogger.sh A users/ericgebhart/miryoku_hd_gold_config.h D users/ericgebhart/mod_layer.h A users/ericgebhart/mod_layers/alt_mods.h A users/ericgebhart/mod_layers/hrm_gacs.h A users/ericgebhart/mod_layers/hrm_gacs_miryoku.h A users/ericgebhart/mod_layers/hrm_gasc.h A users/ericgebhart/mod_layers/hrm_sacg.h A users/ericgebhart/mod_layers/hrs_nav.h A users/ericgebhart/mod_layers/mod_layer.h A users/ericgebhart/mod_layers/trns_mods.h A users/ericgebhart/oled/oled_cartes.c A users/ericgebhart/oled/oled_layers.c A users/ericgebhart/oled/oled_stuff.c A users/ericgebhart/oled/oled_stuff.h D users/ericgebhart/oled_stuff.c M users/ericgebhart/process_records.c M users/ericgebhart/readme.md M users/ericgebhart/rules.mk D users/ericgebhart/switch-kbd A users/rmeli/.gitignore A users/rmeli/config.h M users/rmeli/keyrecords/tap_dances.h M users/rmeli/keyrecords/unicode.h A users/rmeli/keyrecords/wrappers.h M users/rmeli/oled/oled.c M users/rmeli/rmeli.h M users/rmeli/rules.mk