diff options
| author |  bunnei | 2018-07-26 12:03:56 -0700 |
|---|---|---|
| committer |  GitHub | 2018-07-26 12:03:56 -0700 |
| commit | f1fbb476df13af4623d5865c1ef57f51e68c3712 (patch) | |
| tree | 7ad67b70494b98d6ffc3ed89d05befe7fdd007a1 | |
| parent | Merge pull request #834 from lioncash/grc (diff) | |
| parent | Port #3702 from Citra (diff) | |
| download | yuzu-f1fbb476df13af4623d5865c1ef57f51e68c3712.tar.gz yuzu-f1fbb476df13af4623d5865c1ef57f51e68c3712.tar.xz yuzu-f1fbb476df13af4623d5865c1ef57f51e68c3712.zip | |
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 | |||
| 11 | .idea/ | 11 | .idea/ |
| 12 | .vs/ | 12 | .vs/ |
| 13 | .vscode/ | 13 | .vscode/ |
| 14 | CMakeLists.txt.user | 14 | CMakeLists.txt.user* |
| 15 | 15 | ||
| 16 | # *nix related | 16 | # *nix related |
| 17 | # Common convention for backup or temporary files | 17 | # 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 = | |||
| 118 | layout_option = | 118 | layout_option = |
| 119 | 119 | ||
| 120 | # Toggle custom layout (using the settings below) on or off. | 120 | # Toggle custom layout (using the settings below) on or off. |
| 121 | # 0 (default): Off , 1: On | 121 | # 0 (default): Off, 1: On |
| 122 | custom_layout = | 122 | custom_layout = |
| 123 | 123 | ||
| 124 | # Screen placement when using Custom layout option | 124 | # Screen placement when using Custom layout option |