Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		@@ -146,7 +146,7 @@ bool command_proc(uint8_t code);
 | 
				
			|||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifndef MAGIC_KEY_EEPROM_CLEAR
 | 
					#ifndef MAGIC_KEY_EEPROM_CLEAR
 | 
				
			||||||
#    define MAGIC_KEY_EEPROM_CLEAR BSPACE
 | 
					#    define MAGIC_KEY_EEPROM_CLEAR BACKSPACE
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifndef MAGIC_KEY_NKRO
 | 
					#ifndef MAGIC_KEY_NKRO
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user