drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Merge remote-tracking branch 'upstream/master' into develop

Browse source 
Conflicts:
	keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk
	keyboards/space_space/rules.mk
This commit is contained in:
James Young 2021-08-19 11:32:23 -07:00
commit 4279b14adf
No known key found for this signature in database
GPG key ID: 8ECFD4391110BC1B
139 changed files with 6481 additions and 447 deletions
Download patch file Download diff file Expand all files Collapse all files

16
layouts/community/ortho_4x12/ajp10304/keymap.c
View file

@ -1,3 +1,19 @@
/* Copyright 2021 Alan Pocklington
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "ajp10304.h"
#include "keymap_uk.h"

2
layouts/community/ortho_4x12/ajp10304/readme.md
View file

@ -1,5 +1,5 @@
# AJP10304 Ortho 4x12 Layout
# For Planck, Shark, JJ40 and Atreus50
# For Planck, Shark, Quark, JJ40 and Atreus50
**Note:** In the tables below where there are two characters on a key,
the second is the output when shift is applied.