Zach White 
		1581ea48dc 
		
			
		
	 
	
	
	Fix develop ( #12039 ) ... 
			Fixes file encoding errors on Windows, and layouts not correctly merging into info.json.
* force utf8 encoding
* correctly merge layouts and layout aliases
* show what aliases point to 
		
	 
		2021-02-27 12:00:50 -08:00 
	 
	
	
		 
	
	
		
			
			
			
			
			
			2021-02-27 12:00:50 -08:00 
		 
	
		
			
			
			
			
			
			2021-02-27 12:00:50 -08:00 
		 
	
		
			
			
			
			
			
			2021-02-27 12:00:50 -08:00 
		 
	
		
			
			
			
			
			
			2019-07-15 12:14:27 -07:00 
		 
	
		
			
			
			
			
			
			2021-02-27 12:00:50 -08:00 
		 
	
		
			
			
			
			
			
			2021-02-01 20:55:35 +01:00 
		 
	
		
			
			
			
			
			
			2020-05-26 13:05:41 -07:00 
		 
	
		
			
			
			
			
			
			2021-02-06 11:27:46 +11:00 
		 
	
		
			
			
			
			
			
			2019-11-12 20:55:41 -08:00 
		 
	
		
			
			
			
			
			
			2020-10-25 14:48:44 -07:00 
		 
	
		
			
			
			
			
			
			2020-10-25 14:48:44 -07:00 
		 
	
		
			
			
			
			
			
			2019-11-12 18:41:38 -08:00 
		 
	
		
			
			
			
			
			
			2020-12-30 10:27:37 -08:00 
		 
	
		
			
			
			
			
			
			2021-02-27 12:00:50 -08:00 
		 
	
		
			
			
			
			
			
			2020-11-02 00:41:01 -08:00 
		 
	
		
			
			
			
			
			
			2021-02-27 12:00:50 -08:00 
		 
	
		
			
			
			
			
			
			2020-05-26 13:05:41 -07:00 
		 
	
		
			
			
			
			
			
			2020-05-26 13:05:41 -07:00 
		 
	
		
			
			
			
			
			
			2021-02-07 21:02:51 +00:00 
		 
	
		
			
			
			
			
			
			2020-01-24 20:31:16 +01:00