Skip to content
Commit 4c41c1ff authored by Michael Raskin's avatar Michael Raskin
Browse files

Merge pull request #3890 from edwtjo/emulationstation-2.0.0-rc1 

emulationstation: 1.0.2 -> 2.0.0-rc1
parents b37af08c a5a92fdd
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment