Merge upstream QMK Firmware at '0.12.52~1'

2021-06-29 12:23:03 -07:00
parent ec7a7beeed f55e39e8a2
commit acf2c323e2
415 changed files with 18692 additions and 7301 deletions
@@ -8,6 +8,8 @@

 #define ENCODER_RESOLUTION 4

+#define ORYX_CONFIGURATOR
+
 /*
  Set any config.h overrides for your specific keymap here.
  See config.h options at https://docs.qmk.fm/#/config_options?id=the-configh-file