From 1eafcfe1a2beca2b189a520e7809a1ac5b79d0f3 Mon Sep 17 00:00:00 2001 From: meancoot Date: Wed, 25 Dec 2013 10:00:14 -0500 Subject: [PATCH] (iOS) Build fix --- apple/common/setting_data.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/apple/common/setting_data.c b/apple/common/setting_data.c index 6c4edfdd62..048e232e79 100644 --- a/apple/common/setting_data.c +++ b/apple/common/setting_data.c @@ -378,13 +378,9 @@ const rarch_setting_t* setting_data_get_list() CONFIG_UINT(g_settings.game_history_size, "game_history_size", "Content History Size", game_history_size) #ifdef HAVE_RGUI -<<<<<<< HEAD - CONFIG_PATH(g_settings.content_directory, "rgui_browser_directory", "Content Directory", DEFAULT_ME_YO) WITH_FLAGS(SD_FLAG_ALLOW_EMPTY | SD_FLAG_PATH_DIR) -======= - CONFIG_PATH(g_settings.rgui_browser_directory, "rgui_browser_directory", "Browser Directory", DEFAULT_ME_YO) WITH_FLAGS(SD_FLAG_ALLOW_EMPTY | SD_FLAG_PATH_DIR) + CONFIG_PATH(g_settings.content_directory, "rgui_browser_directory", "Content Directory", DEFAULT_ME_YO) WITH_FLAGS(SD_FLAG_ALLOW_EMPTY | SD_FLAG_PATH_DIR) CONFIG_PATH(g_settings.rgui_config_directory, "rgui_config_directory", "Config Directory", DEFAULT_ME_YO) WITH_FLAGS(SD_FLAG_ALLOW_EMPTY | SD_FLAG_PATH_DIR) CONFIG_BOOL(g_settings.rgui_show_start_screen, "rgui_show_start_screen", "Show Start Screen", rgui_show_start_screen) ->>>>>>> (iOS) Add some common settings to the root of the core settings menu; Add some default paths; Add a default overlay #endif #ifdef HAVE_OVERLAY