summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-07-26 21:03:56 +0200
committerGitHub <noreply@github.com>2018-07-26 21:03:56 +0200
commitf1fbb476df13af4623d5865c1ef57f51e68c3712 (patch)
tree7ad67b70494b98d6ffc3ed89d05befe7fdd007a1
parentMerge pull request #834 from lioncash/grc (diff)
parentPort #3702 from Citra (diff)
downloadyuzu-f1fbb476df13af4623d5865c1ef57f51e68c3712.tar
yuzu-f1fbb476df13af4623d5865c1ef57f51e68c3712.tar.gz
yuzu-f1fbb476df13af4623d5865c1ef57f51e68c3712.tar.bz2
yuzu-f1fbb476df13af4623d5865c1ef57f51e68c3712.tar.lz
yuzu-f1fbb476df13af4623d5865c1ef57f51e68c3712.tar.xz
yuzu-f1fbb476df13af4623d5865c1ef57f51e68c3712.tar.zst
yuzu-f1fbb476df13af4623d5865c1ef57f51e68c3712.zip
-rw-r--r--.gitignore2
-rw-r--r--src/yuzu_cmd/default_ini.h2
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