Merge remote-tracking branch 'upstream/master' into develop
This commit is contained in:
		
						commit
						9e18f41fcf
					
				
					 285 changed files with 52 additions and 332 deletions
				
			
		| 
						 | 
				
			
			@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER QMK
 | 
			
		||||
#define PRODUCT CK4x4
 | 
			
		||||
#define DESCRIPTION Cannon Keys 4x4 MacroPad
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 4
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue