Merge remote-tracking branch 'upstream/develop' into xap
This commit is contained in:
		
						commit
						85331d56ec
					
				
					 61 changed files with 7558 additions and 34 deletions
				
			
		| 
						 | 
				
			
			@ -188,6 +188,10 @@ extern layer_state_t layer_state;
 | 
			
		|||
#    include "st7565.h"
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifdef QUANTUM_PAINTER_ENABLE
 | 
			
		||||
#    include "qp.h"
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifdef DIP_SWITCH_ENABLE
 | 
			
		||||
#    include "dip_switch.h"
 | 
			
		||||
#endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue