From aa41997b56331b68fc92b03a17b0ea9855a20518 Mon Sep 17 00:00:00 2001 From: M4xw Date: Thu, 7 Jun 2018 19:26:31 +0200 Subject: [PATCH 1/2] Add icon.jpg to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 1cfa712e58..65ab76f169 100644 --- a/.gitignore +++ b/.gitignore @@ -153,3 +153,4 @@ retroarch.js.mem *.nso *.pfs0 exefs/* +/icon.jpg -- GitLab From 2511bc07feedb418776b219e3361740baca96c49 Mon Sep 17 00:00:00 2001 From: Miguel Castiblanco Date: Thu, 7 Jun 2018 17:10:52 -0700 Subject: [PATCH 2/2] [Overlay] Disable temporarily to fix issues --- retroarch.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retroarch.cfg b/retroarch.cfg index 8503c030f7..5cf4599da1 100644 --- a/retroarch.cfg +++ b/retroarch.cfg @@ -1,5 +1,5 @@ core_updater_buildbot_assets_url = "http://buildbot.libretro.com/assets/" -input_overlay = "./overlay.cfg" +input_overlay = "null" screenshot_directory = "default" system_directory = "default" video_shader_dir = "default" -- GitLab