[READY] android: Update and rename Pro Controller.cfg to Nintendo Switch Pro Controller.cfg#1158
Closed
davidhedlund wants to merge 0 commit intolibretro:masterfrom
davidhedlund:master
Closed
[READY] android: Update and rename Pro Controller.cfg to Nintendo Switch Pro Controller.cfg#1158davidhedlund wants to merge 0 commit intolibretro:masterfrom davidhedlund:master
Pro Controller.cfg to Nintendo Switch Pro Controller.cfg#1158davidhedlund wants to merge 0 commit intolibretro:masterfrom
davidhedlund:master
Conversation
android/Pro Controller.cfg renamed to android/Nintendo Switch Pro Controller.cfg, and added input_menu_toggle_btn comment
android/Pro Controller.cfg renamed to android/Nintendo Switch Pro Controller.cfg, and added input_menu_toggle_btn commentandroid/Pro Controller.cfg updated
android/Pro Controller.cfg updatedPro Controller.cfg to Nintendo Switch Pro Controller.cfg
Pro Controller.cfg to Nintendo Switch Pro Controller.cfgPro Controller.cfg to Nintendo Switch Pro Controller.cfg
RobLoach
requested changes
Sep 28, 2024
Member
RobLoach
left a comment
There was a problem hiding this comment.
Mind fixing the conflict? Thanks.
Closed
Contributor
|
HI, a merge conflict needs to be resolved here |
Contributor
Author
Where do we go from here? |
Contributor
Author
|
Sometimes simply closing and reopening the pull request can trigger Travis CI to retry reporting the status. Testing... |
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
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.
Changes
Pro Controller.cfgtoNintendo Switch Pro Controller.cfg: Older Android kernels identify the controller as "Pro Controller," whereas newer kernels recognize it as "Nintendo Switch Pro Controller," which provides a more complete name.Testing