yuzu/yuzu-mainline
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-mainline.git synced 2024-12-24 02:35:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #835 from FearlessTobi/port-minor-prs

Browse source 
Port #3641 and #3702 from Citra (Small changes to default_ini and gitignore)
This commit is contained in:
bunnei 2018-07-26 12:03:56 -07:00 committed by GitHub
parent 8440b814bc 9d2a1c6f12
commit f1fbb476df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -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

2
src/yuzu_cmd/default_ini.h
View file

@ -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