Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						c03859a3e4
					
				
					 265 changed files with 397 additions and 245 deletions
				
			
		| 
						 | 
				
			
			@ -5,7 +5,7 @@ MCU = atmega16u2
 | 
			
		|||
BOOTLOADER = atmel-dfu
 | 
			
		||||
 | 
			
		||||
# Build Options
 | 
			
		||||
#   comment out to disable the options.
 | 
			
		||||
#   change yes to no to disable
 | 
			
		||||
#
 | 
			
		||||
BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
 | 
			
		||||
MOUSEKEY_ENABLE = no		# Mouse keys
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue