Skip to content
Snippets Groups Projects
Verified Commit a914056c authored by João Magalhães's avatar João Magalhães :rocket:
Browse files

Merge branch 'master' into joamag/color

# Conflicts:
#	frontends/sdl/src/main.rs
parents 4f513eed 459f7167
No related branches found
No related tags found
1 merge request!16Support for Game Boy Color (CGB) 😎🖍️
Pipeline #2553 passed
Showing
with 641 additions and 28 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment