~ruther/qmk_firmware

54ae829b045afee0b08c0c90286e9def0f77fffe — QMK Bot 4 years ago 7d797d2 + fac5ec4
Merge remote-tracking branch 'origin/master' into develop
R keyboards/gmmk/pro/keymaps/jackkenney/keymap.c => keyboards/gmmk/pro/ansi/keymaps/jackkenney/keymap.c +0 -0
R keyboards/gmmk/pro/keymaps/mike1808/.gitignore => keyboards/gmmk/pro/ansi/keymaps/mike1808/.gitignore +0 -0
R keyboards/gmmk/pro/keymaps/mike1808/README.md => keyboards/gmmk/pro/ansi/keymaps/mike1808/README.md +0 -0
R keyboards/gmmk/pro/keymaps/mike1808/config.h => keyboards/gmmk/pro/ansi/keymaps/mike1808/config.h +0 -0
R keyboards/gmmk/pro/keymaps/mike1808/encoder.c => keyboards/gmmk/pro/ansi/keymaps/mike1808/encoder.c +0 -0
R keyboards/gmmk/pro/keymaps/mike1808/encoder.h => keyboards/gmmk/pro/ansi/keymaps/mike1808/encoder.h +0 -0
R keyboards/gmmk/pro/keymaps/mike1808/fun.c => keyboards/gmmk/pro/ansi/keymaps/mike1808/fun.c +0 -0
R keyboards/gmmk/pro/keymaps/mike1808/keymap.c => keyboards/gmmk/pro/ansi/keymaps/mike1808/keymap.c +0 -0
R keyboards/gmmk/pro/keymaps/mike1808/mike1808.c => keyboards/gmmk/pro/ansi/keymaps/mike1808/mike1808.c +1 -1
@@ 20,7 20,7 @@
#else
// `PROGMEM const char secret[][x]` may work better, but it takes up more space in the firmware
// And I'm not familiar enough to know which is better or why...
static const char *const secret[] = {"test1", "test2", "test3", "test4", "test5"};
static const char *const secrets[] = {"test1", "test2", "test3", "test4", "test5"};
#endif

// userspace_config_t userspace_config;

R keyboards/gmmk/pro/keymaps/mike1808/mike1808.h => keyboards/gmmk/pro/ansi/keymaps/mike1808/mike1808.h +0 -0
R keyboards/gmmk/pro/keymaps/mike1808/process_record.c => keyboards/gmmk/pro/ansi/keymaps/mike1808/process_record.c +0 -0
R keyboards/gmmk/pro/keymaps/mike1808/process_record.h => keyboards/gmmk/pro/ansi/keymaps/mike1808/process_record.h +0 -0
R keyboards/gmmk/pro/keymaps/mike1808/rgb_matrix_ledmaps.c => keyboards/gmmk/pro/ansi/keymaps/mike1808/rgb_matrix_ledmaps.c +0 -0
R keyboards/gmmk/pro/keymaps/mike1808/rgb_matrix_ledmaps.h => keyboards/gmmk/pro/ansi/keymaps/mike1808/rgb_matrix_ledmaps.h +0 -0
R keyboards/gmmk/pro/keymaps/mike1808/rules.mk => keyboards/gmmk/pro/ansi/keymaps/mike1808/rules.mk +0 -0
R keyboards/gmmk/pro/keymaps/mike1808/utils.c => keyboards/gmmk/pro/ansi/keymaps/mike1808/utils.c +0 -0
R keyboards/gmmk/pro/keymaps/mike1808/utils.h => keyboards/gmmk/pro/ansi/keymaps/mike1808/utils.h +0 -0