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:
		
							
								
								
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user