-
-
Notifications
You must be signed in to change notification settings - Fork 39.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Moved s7_elephant and bear65 into 1 folder #10528
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Keyboard moves are currently considered a "breaking change" and will need to target develop. Also build commands within readmes should be updated.
4da4acc
to
760ccb5
Compare
Holy moly, I did it right this time! I rebased my branch against develop |
Glad to hear it! And yeah, the first few times can be .... "fun". After a while, you really git it down. :) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you add a GPL2+ compatible license header to all of the c
and h
files? Including the keymap.c files?
For instance:
qmk_firmware/quantum/template/base/keyboard.c
Lines 1 to 15 in 28ff511
/* Copyright %YEAR% %YOUR_NAME% | |
* | |
* 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/>. | |
*/ |
keyboards/jacky_studio/s7_elephant/rev1/keymaps/default/keymap.c
Outdated
Show resolved
Hide resolved
What's the current status of this? I had it ready to merge before, but now it's been closed and reopened. If I fix the conflicts, would this be ready to merge again? |
We were in the process of merging the |
@MudkipMao yes, please rebase this PR, then it should be ready to merge next cycle. |
807d725
to
123e239
Compare
I had to do a --force-with-lease to rebase into develop, but it should be ready to go now |
Jacky, the designer of S7 Elephant and Bear 65 will have his own folder now, in the event that he runs more products in the future (which is likely).
Description
The 2 boards are now moved into the folder jacky_studio/
I have checked with Jacky, and he is ok with this naming convention
Types of Changes
Checklist