Skip to content
Snippets Groups Projects
Unverified Commit f1fbb476 authored by bunnei's avatar bunnei Committed by GitHub
Browse files

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

Port #3641 and #3702 from Citra (Small changes to default_ini and gitignore)
parents 8440b814 9d2a1c6f
No related branches found
No related tags found
No related merge requests found
...@@ -11,7 +11,7 @@ src/common/scm_rev.cpp ...@@ -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 = ...@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment