summaryrefslogtreecommitdiff
path: root/layouts
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2021-08-19 11:32:23 -0700
committerJames Young <18669334+noroadsleft@users.noreply.github.com>2021-08-19 11:32:23 -0700
commit4279b14adffe081a3dfb17fa0f04ed21513e5eda (patch)
tree770bd82b05595b686ad8cfdce79ea7f8439bda83 /layouts
parent9d1c98c891bb8e1e98dc618e0693a7efff23a22e (diff)
parentf4f679779e1404d9dc34c64823b9eb993bfa7ab3 (diff)
downloadqmk_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')
-rw-r--r--layouts/community/ortho_4x12/ajp10304/keymap.c16
-rw-r--r--layouts/community/ortho_4x12/ajp10304/readme.md2
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 3badce2eaf..c55e99af79 100644
--- a/layouts/community/ortho_4x12/ajp10304/keymap.c
+++ b/layouts/community/ortho_4x12/ajp10304/keymap.c
@@ -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"
diff --git a/layouts/community/ortho_4x12/ajp10304/readme.md b/layouts/community/ortho_4x12/ajp10304/readme.md
index 6f2330f943..be6afa6fe4 100644
--- a/layouts/community/ortho_4x12/ajp10304/readme.md
+++ b/layouts/community/ortho_4x12/ajp10304/readme.md
@@ -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.