Merge remote-tracking branch 'upstream/master' into develop
This commit is contained in:
		
						commit
						61689ae609
					
				
					 550 changed files with 1689 additions and 1819 deletions
				
			
		| 
						 | 
				
			
			@ -19,12 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
 | 
			
		||||
#include "config_common.h"
 | 
			
		||||
 | 
			
		||||
/* USB Device descriptor parameter */
 | 
			
		||||
#define VENDOR_ID       0xFEED
 | 
			
		||||
#define PRODUCT_ID      0x3070
 | 
			
		||||
#define MANUFACTURER    Maple Computing
 | 
			
		||||
#define PRODUCT         Christmas Tree
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 6
 | 
			
		||||
#define MATRIX_COLS 1
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue