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

Port #3641 and #3702 from Citra (Small changes to default_ini and gitignore)
8 years ago · e042f5b900
2 changed files with 2 additions and 2 deletions
--- 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