mirror of
				https://github.com/mfulz/qmk_firmware.git
				synced 2025-10-31 21:32:31 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						a0805eda18
					
				| @ -346,9 +346,9 @@ | |||||||
|                 {"label": "\u2191", "matrix": [4, 14], "x": 16.25, "y": 4.25}, |                 {"label": "\u2191", "matrix": [4, 14], "x": 16.25, "y": 4.25}, | ||||||
| 
 | 
 | ||||||
|                 {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, |                 {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, | ||||||
|                 {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25}, |                 {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25}, | ||||||
|                 {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, |                 {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, | ||||||
|                 {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 7}, |                 {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7}, | ||||||
|                 {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5}, |                 {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5}, | ||||||
|                 {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25}, |                 {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25}, | ||||||
|                 {"label": "Ctrl", "matrix": [4, 15], "x": 13.5, "y": 5.25, "w": 1.5}, |                 {"label": "Ctrl", "matrix": [4, 15], "x": 13.5, "y": 5.25, "w": 1.5}, | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 QMK Bot
						QMK Bot