mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 04:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Another buildfix

Browse Source
This commit is contained in:
twinaphex 2017-01-26 14:16:03 +01:00
parent fa5f678444
commit ac75cd2820
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
intl/msg_hash_chs.c
View File

@ -333,13 +333,8 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len)
snprintf(s, len, snprintf(s, len,
"运行列表目录. \n" "运行列表目录. \n"
" \n" " \n"
<<<<<<< HEAD
"保存所有播放列表到此 \n"
"目录。");
=======
"保存所有播放列表到 \n" "保存所有播放列表到 \n"
"此目录。"); "此目录。");
>>>>>>> 01b01c5debd70b8b1cf6972ee399a5144c013325
break; break;
case MENU_ENUM_LABEL_DUMMY_ON_CORE_SHUTDOWN: case MENU_ENUM_LABEL_DUMMY_ON_CORE_SHUTDOWN:
snprintf(s, len, snprintf(s, len,