diff options
author | James Young <18669334+noroadsleft@users.noreply.github.com> | 2021-08-19 11:32:23 -0700 |
---|---|---|
committer | James Young <18669334+noroadsleft@users.noreply.github.com> | 2021-08-19 11:32:23 -0700 |
commit | 4279b14adffe081a3dfb17fa0f04ed21513e5eda (patch) | |
tree | 770bd82b05595b686ad8cfdce79ea7f8439bda83 /layouts/community/ortho_4x12 | |
parent | 9d1c98c891bb8e1e98dc618e0693a7efff23a22e (diff) | |
parent | f4f679779e1404d9dc34c64823b9eb993bfa7ab3 (diff) | |
download | qmk_firmware-4279b14adffe081a3dfb17fa0f04ed21513e5eda.tar.gz qmk_firmware-4279b14adffe081a3dfb17fa0f04ed21513e5eda.zip |
Merge remote-tracking branch 'upstream/master' into develop
Conflicts:
keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk
keyboards/space_space/rules.mk
Diffstat (limited to 'layouts/community/ortho_4x12')
-rw-r--r-- | layouts/community/ortho_4x12/ajp10304/keymap.c | 16 | ||||
-rw-r--r-- | layouts/community/ortho_4x12/ajp10304/readme.md | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/layouts/community/ortho_4x12/ajp10304/keymap.c b/layouts/community/ortho_4x12/ajp10304/keymap.c index 3badce2ea..c55e99af7 100644 --- a/layouts/community/ortho_4x12/ajp10304/keymap.c +++ b/layouts/community/ortho_4x12/ajp10304/keymap.c | |||
@@ -1,3 +1,19 @@ | |||
1 | /* Copyright 2021 Alan Pocklington | ||
2 | * | ||
3 | * This program is free software: you can redistribute it and/or modify | ||
4 | * it under the terms of the GNU General Public License as published by | ||
5 | * the Free Software Foundation, either version 2 of the License, or | ||
6 | * (at your option) any later version. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | * GNU General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public License | ||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
15 | */ | ||
16 | |||
1 | #include "ajp10304.h" | 17 | #include "ajp10304.h" |
2 | #include "keymap_uk.h" | 18 | #include "keymap_uk.h" |
3 | 19 | ||
diff --git a/layouts/community/ortho_4x12/ajp10304/readme.md b/layouts/community/ortho_4x12/ajp10304/readme.md index 6f2330f94..be6afa6fe 100644 --- a/layouts/community/ortho_4x12/ajp10304/readme.md +++ b/layouts/community/ortho_4x12/ajp10304/readme.md | |||
@@ -1,5 +1,5 @@ | |||
1 | # AJP10304 Ortho 4x12 Layout | 1 | # AJP10304 Ortho 4x12 Layout |
2 | # For Planck, Shark, JJ40 and Atreus50 | 2 | # For Planck, Shark, Quark, JJ40 and Atreus50 |
3 | 3 | ||
4 | **Note:** In the tables below where there are two characters on a key, | 4 | **Note:** In the tables below where there are two characters on a key, |
5 | the second is the output when shift is applied. | 5 | the second is the output when shift is applied. |