From 7a2acc86e6f7bc52666f00ef7e110f47d8ce2746 Mon Sep 17 00:00:00 2001 From: fearlessTobi Date: Thu, 26 Jul 2018 15:35:10 +0200 Subject: [PATCH 1/2] Port #3641 from Citra --- src/yuzu_cmd/default_ini.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h index 5eca38b48..567f23417 100644 --- a/src/yuzu_cmd/default_ini.h +++ b/src/yuzu_cmd/default_ini.h @@ -118,7 +118,7 @@ bg_green = layout_option = # Toggle custom layout (using the settings below) on or off. -# 0 (default): Off , 1: On +# 0 (default): Off, 1: On custom_layout = # Screen placement when using Custom layout option From 9d2a1c6f1218f801b8ef6a683a9d48288516d7c9 Mon Sep 17 00:00:00 2001 From: fearlessTobi Date: Thu, 26 Jul 2018 15:35:24 +0200 Subject: [PATCH 2/2] Port #3702 from Citra --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5ec0d110b..f704edeb8 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,7 @@ src/common/scm_rev.cpp .idea/ .vs/ .vscode/ -CMakeLists.txt.user +CMakeLists.txt.user* # *nix related # Common convention for backup or temporary files