Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						2f59e1c1d9
					
				
					 2 changed files with 4 additions and 4 deletions
				
			
		| 
						 | 
				
			
			@ -332,11 +332,11 @@ enum quantum_keycodes {
 | 
			
		|||
 | 
			
		||||
    MIDI_VELOCITY_MIN,
 | 
			
		||||
    MI_VEL_0 = MIDI_VELOCITY_MIN,
 | 
			
		||||
#ifdef VIA_ENABLE
 | 
			
		||||
#    ifdef VIA_ENABLE
 | 
			
		||||
    MI_VEL_1 = MIDI_VELOCITY_MIN,
 | 
			
		||||
#else
 | 
			
		||||
#    else
 | 
			
		||||
    MI_VEL_1,
 | 
			
		||||
#endif
 | 
			
		||||
#    endif
 | 
			
		||||
    MI_VEL_2,
 | 
			
		||||
    MI_VEL_3,
 | 
			
		||||
    MI_VEL_4,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue