diff options
| author | bunnei <bunneidev@gmail.com> | 2018-07-26 12:03:56 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-26 12:03:56 -0700 |
| commit | f1fbb476df13af4623d5865c1ef57f51e68c3712 (patch) | |
| tree | 7ad67b70494b98d6ffc3ed89d05befe7fdd007a1 | |
| parent | 8440b814bcba9a5e6229f88ea211accebf778101 (diff) | |
| parent | 9d2a1c6f1218f801b8ef6a683a9d48288516d7c9 (diff) | |
Merge pull request #835 from FearlessTobi/port-minor-prs
Port #3641 and #3702 from Citra (Small changes to default_ini and gitignore)
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | src/yuzu_cmd/default_ini.h | 2 |
2 files changed, 2 insertions, 2 deletions
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 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 |