Merged
Conversation
2.Change OEM's keyboard name from OEM's name. 3.Support IDT keyboard (4 types ,us,uk,jp,br). # Conflicts: # Project-Aurora/Project-Aurora/Project-Aurora.csproj
# Conflicts: # Project-Aurora/Project-Aurora/Project-Aurora.csproj
This was referenced Mar 31, 2020
Closed
diogotr7
requested changes
Mar 31, 2020
Project-Aurora/Project-Aurora/Devices/Uniwill/KeyboardDevice.cs
Outdated
Show resolved
Hide resolved
Project-Aurora/Project-Aurora/Devices/Uniwill/KeyboardDevice.cs
Outdated
Show resolved
Hide resolved
Project-Aurora/Project-Aurora/Devices/Uniwill/KeyboardDevice.cs
Outdated
Show resolved
Hide resolved
Project-Aurora/Project-Aurora/Devices/Uniwill/KeyboardDevice.cs
Outdated
Show resolved
Hide resolved
Project-Aurora/Project-Aurora/Devices/Uniwill/KeyboardDevice.cs
Outdated
Show resolved
Hide resolved
Project-Aurora/Project-Aurora/Devices/Uniwill/KeyboardDevice.cs
Outdated
Show resolved
Hide resolved
Project-Aurora/Project-Aurora/Devices/Uniwill/KeyboardDevice.cs
Outdated
Show resolved
Hide resolved
diogotr7
reviewed
Apr 1, 2020
diogotr7
reviewed
Apr 1, 2020
added 9 commits
April 7, 2020 17:48
no actual code changes were made in this commit
Collaborator
|
I have resolved the merge conflict and made some whitespace and code style changes locally, which will not affect any of the functionality. Is it okay if i push these changes here to finally merge into dev? @rushdie99 |
diogotr7
approved these changes
May 12, 2020
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
From master to dev.