mirror of
https://github.com/yuzu-emu/yuzu-mainline
synced 2024-11-26 06:48:04 +00:00
Merge pull request #835 from FearlessTobi/port-minor-prs
Port #3641 and #3702 from Citra (Small changes to default_ini and gitignore)
This commit is contained in:
commit
f1fbb476df
2 changed files with 2 additions and 2 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -11,7 +11,7 @@ src/common/scm_rev.cpp
|
||||||
.idea/
|
.idea/
|
||||||
.vs/
|
.vs/
|
||||||
.vscode/
|
.vscode/
|
||||||
CMakeLists.txt.user
|
CMakeLists.txt.user*
|
||||||
|
|
||||||
# *nix related
|
# *nix related
|
||||||
# Common convention for backup or temporary files
|
# Common convention for backup or temporary files
|
||||||
|
|
|
@ -118,7 +118,7 @@ bg_green =
|
||||||
layout_option =
|
layout_option =
|
||||||
|
|
||||||
# Toggle custom layout (using the settings below) on or off.
|
# Toggle custom layout (using the settings below) on or off.
|
||||||
# 0 (default): Off , 1: On
|
# 0 (default): Off, 1: On
|
||||||
custom_layout =
|
custom_layout =
|
||||||
|
|
||||||
# Screen placement when using Custom layout option
|
# Screen placement when using Custom layout option
|
||||||
|
|
Loading…
Reference in a new issue