Skip to content
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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add empty scancode implementation for Linux (DRM) platform #2148

Merged
merged 0 commits into from Jul 1, 2022

Conversation

kimci86
Copy link
Contributor

@kimci86 kimci86 commented Jun 23, 2022

Description

To bring #1235 a little closer to completion, I rebased the feature branch on 2.6.x + a bugfix (see #2146) and added an empty implementation for Linux (DRM) platform recently added in #2029.

It does nothing, but it compiles! 馃コ

@kimci86
Copy link
Contributor Author

kimci86 commented Jun 23, 2022

I am not sure if I need to so something about the merge conflict.
Feel free to summon git powers to take what you want from this PR.
The "relevant" part is the last commit 05e7d6d c666c83.

@kimci86
Copy link
Contributor Author

kimci86 commented Jun 29, 2022

Rebased on the new 2.6.x.

@eXpl0it3r eXpl0it3r merged commit c666c83 into SFML:feature/scancode Jul 1, 2022
@eXpl0it3r eXpl0it3r added this to Discussion in SFML 2.6.0 via automation Jul 1, 2022
@eXpl0it3r eXpl0it3r added this to the 2.6 milestone Jul 1, 2022
@eXpl0it3r eXpl0it3r moved this from Discussion to Done in SFML 2.6.0 Jul 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
No open projects
SFML 2.6.0
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

2 participants