ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

One more for 

Merge remote-tracking branch 'remotes/origin/master' into feature-highscores
This commit is contained in:
thrust26 2020-02-21 12:44:06 +01:00
parent 38bc7eb245
commit ff3b69cec7
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/LauncherDialog.cxx
View File

@ -208,10 +208,6 @@ LauncherDialog::LauncherDialog(OSystem& osystem, DialogContainer& parent,
// Create (empty) context menu for ROM list options // Create (empty) context menu for ROM list options
myMenu = make_unique<ContextMenu>(this, osystem.frameBuffer().font(), EmptyVarList); myMenu = make_unique<ContextMenu>(this, osystem.frameBuffer().font(), EmptyVarList);
<<<<<<< HEAD
=======
>>>>>>> remotes/origin/master
// Create global props dialog, which is used to temporarily overrride // Create global props dialog, which is used to temporarily overrride
// ROM properties // ROM properties