Skip to content
Snippets Groups Projects
Commit fc36b8d7 authored by Logan Aerl Arias's avatar Logan Aerl Arias
Browse files

Merge branch 'cherry-pick-65da8e52' into 'master' 

Merge branch 'batocera' into 'master'

See merge request STJr/SRB2!2311
parents 7c33cc37 832c46b2
No related branches found
No related tags found
1 merge request!2311Merge branch 'batocera' into 'master'
Pipeline #2376 passed
Stage: build
Hide whitespace changes
Inline Side-by-side
Showing
with 123 additions and 2 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment