diff options
| author | QMK Bot <hello@qmk.fm> | 2021-03-21 02:43:41 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-03-21 02:43:41 +0000 |
| commit | fe58770df8a269e288269459fea09a53cba956d0 (patch) | |
| tree | 1430d4047242added67f5af3b004bc167b80175a | |
| parent | 00a0c81f8ea0d0ae3e8fe794370e218a42f93800 (diff) | |
| parent | c5b0366a25639b34c2714e14b5a25a0133bc8e9a (diff) | |
| download | qmk_firmware-fe58770df8a269e288269459fea09a53cba956d0.tar.gz qmk_firmware-fe58770df8a269e288269459fea09a53cba956d0.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | keyboards/kira80/config.h | 2 | ||||
| -rw-r--r-- | keyboards/kira80/keymaps/ansi/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/kira80/keymaps/ansi_wkl/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/kira80/keymaps/default/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/kira80/keymaps/iso/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/kira80/keymaps/via/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/kira80/kira80.c | 2 | ||||
| -rw-r--r-- | keyboards/kira80/kira80.h | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/keyboards/kira80/config.h b/keyboards/kira80/config.h index d61d23ab6..d73c2faed 100644 --- a/keyboards/kira80/config.h +++ b/keyboards/kira80/config.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | Copyright 2020 Lorenz Wellmer | 2 | Copyright 2020 kb-elmo<mail@elmo.space> |
| 3 | 3 | ||
| 4 | This program is free software: you can redistribute it and/or modify | 4 | This program is free software: you can redistribute it and/or modify |
| 5 | it under the terms of the GNU General Public License as published by | 5 | it under the terms of the GNU General Public License as published by |
diff --git a/keyboards/kira80/keymaps/ansi/keymap.c b/keyboards/kira80/keymaps/ansi/keymap.c index c25d9cbea..21e4ce66e 100644 --- a/keyboards/kira80/keymaps/ansi/keymap.c +++ b/keyboards/kira80/keymaps/ansi/keymap.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* Copyright 2020 Lorenz Wellmer | 1 | /* Copyright 2020 kb-elmo<mail@elmo.space> |
| 2 | * | 2 | * |
| 3 | * This program is free software: you can redistribute it and/or modify | 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 | 4 | * it under the terms of the GNU General Public License as published by |
diff --git a/keyboards/kira80/keymaps/ansi_wkl/keymap.c b/keyboards/kira80/keymaps/ansi_wkl/keymap.c index 398d9f811..85411bbcd 100644 --- a/keyboards/kira80/keymaps/ansi_wkl/keymap.c +++ b/keyboards/kira80/keymaps/ansi_wkl/keymap.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* Copyright 2020 Lorenz Wellmer | 1 | /* Copyright 2020 kb-elmo<mail@elmo.space> |
| 2 | * | 2 | * |
| 3 | * This program is free software: you can redistribute it and/or modify | 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 | 4 | * it under the terms of the GNU General Public License as published by |
diff --git a/keyboards/kira80/keymaps/default/keymap.c b/keyboards/kira80/keymaps/default/keymap.c index 44a4236f7..e8468a0db 100644 --- a/keyboards/kira80/keymaps/default/keymap.c +++ b/keyboards/kira80/keymaps/default/keymap.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* Copyright 2020 Lorenz Wellmer | 1 | /* Copyright 2020 kb-elmo<mail@elmo.space> |
| 2 | * | 2 | * |
| 3 | * This program is free software: you can redistribute it and/or modify | 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 | 4 | * it under the terms of the GNU General Public License as published by |
diff --git a/keyboards/kira80/keymaps/iso/keymap.c b/keyboards/kira80/keymaps/iso/keymap.c index 1890aa2e1..a4c86fbf3 100644 --- a/keyboards/kira80/keymaps/iso/keymap.c +++ b/keyboards/kira80/keymaps/iso/keymap.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* Copyright 2020 Lorenz Wellmer | 1 | /* Copyright 2020 kb-elmo<mail@elmo.space> |
| 2 | * | 2 | * |
| 3 | * This program is free software: you can redistribute it and/or modify | 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 | 4 | * it under the terms of the GNU General Public License as published by |
diff --git a/keyboards/kira80/keymaps/via/keymap.c b/keyboards/kira80/keymaps/via/keymap.c index ebac6c6bd..d87554104 100644 --- a/keyboards/kira80/keymaps/via/keymap.c +++ b/keyboards/kira80/keymaps/via/keymap.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* Copyright 2020 Lorenz Wellmer | 1 | /* Copyright 2020 kb-elmo<mail@elmo.space> |
| 2 | * | 2 | * |
| 3 | * This program is free software: you can redistribute it and/or modify | 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 | 4 | * it under the terms of the GNU General Public License as published by |
diff --git a/keyboards/kira80/kira80.c b/keyboards/kira80/kira80.c index b3ebcae29..0f79316fb 100644 --- a/keyboards/kira80/kira80.c +++ b/keyboards/kira80/kira80.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* Copyright 2020 Lorenz Wellmer | 1 | /* Copyright 2020 kb-elmo<mail@elmo.space> |
| 2 | * | 2 | * |
| 3 | * This program is free software: you can redistribute it and/or modify | 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 | 4 | * it under the terms of the GNU General Public License as published by |
diff --git a/keyboards/kira80/kira80.h b/keyboards/kira80/kira80.h index 7a037e9e4..079153639 100644 --- a/keyboards/kira80/kira80.h +++ b/keyboards/kira80/kira80.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* Copyright 2020 Lorenz Wellmer | 1 | /* Copyright 2020 kb-elmo<mail@elmo.space> |
| 2 | * | 2 | * |
| 3 | * This program is free software: you can redistribute it and/or modify | 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 | 4 | * it under the terms of the GNU General Public License as published by |