mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 21:32:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:fr500/RetroArch

Browse Source 
Conflicts:
	frontend/menu/menu_common.c
This commit is contained in:
AndresSM 2014-03-03 18:45:06 -05:00
commit 511f158255
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/menu/menu_common.c
View File

@ -1926,7 +1926,6 @@ void menu_populate_entries(void *data, unsigned menu_type)
file_list_push(rgui->selection_buf, "No options available.", RGUI_SETTINGS_CORE_OPTION_NONE, 0);
break;
case RGUI_SETTINGS_CORE_INFO:
<<<<<<< HEAD
file_list_clear(rgui->selection_buf);
if (rgui->core_info_current.data)
{