Merge remote-tracking branch 'origin/master' into develop

2 years ago · a897c44132
parent f85001e2c6 b833cd0d07
commit a897c44132
2 changed files with 3 additions and 1 deletions
--- a/users/dshields/config.h
+++ b/users/dshields/config.h
@ -9,6 +9,7 @@
 #define TAPPING_TERM              200
 #define BACKLIGHT_BREATHING
 #define DYNAMIC_MACRO_NO_NESTING
+#define BOTH_SHIFTS_TURNS_ON_CAPS_WORD

 #define MOUSEKEY_INTERVAL         20
 #define MOUSEKEY_DELAY            0
--- a/users/dshields/rules.mk
+++ b/users/dshields/rules.mk
@ -9,7 +9,8 @@ SPACE_CADET_ENABLE    = no
 LEADER_ENABLE         = no
 DYNAMIC_MACRO_ENABLE  = yes

-LTO_ENABLE = yes
+LTO_ENABLE            = yes
+CAPS_WORD_ENABLE      = yes

 ifeq ($(strip $(KEYBOARD)), planck/rev3)
 	AUDIO_ENABLE	  = no