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 
		 
	
		
			
			
			
			
			
			2020-10-25 14:48:44 -07:00 
		 
	
		
			
			
			
			
			
			2020-10-06 16:46:10 -07:00 
		 
	
		
			
			
			
			
			
			2021-02-13 10:26:45 -08:00 
		 
	
		
			
			
			
			
			
			2020-12-30 10:27:37 -08:00 
		 
	
		
			
			
			
			
			
			2020-12-10 19:02:41 +00:00 
		 
	
		
			
			
			
			
			
			2020-11-04 19:18:47 +00:00 
		 
	
		
			
			
			
			
			
			2021-02-07 21:02:51 +00:00 
		 
	
		
			
			
			
			
			
			2019-11-20 14:54:18 -08:00 
		 
	
		
			
			
			
			
			
			2020-04-08 09:31:14 -07:00 
		 
	
		
			
			
			
			
			
			2021-01-31 12:46:00 -08:00 
		 
	
		
			
			
			
			
			
			2020-12-24 02:36:44 +00:00 
		 
	
		
			
			
			
			
			
			2021-02-07 21:02:51 +00:00 
		 
	
		
			
			
			
			
			
			2020-04-08 09:31:14 -07:00 
		 
	
		
			
			
			
			
			
			2021-02-27 12:00:50 -08:00 
		 
	
		
			
			
			
			
			
			2021-02-07 21:02:51 +00:00 
		 
	
		
			
			
			
			
			
			2021-02-27 12:00:50 -08:00 
		 
	
		
			
			
			
			
			
			2020-11-07 09:56:08 -08:00 
		 
	
		
			
			
			
			
			
			2020-04-08 09:31:14 -07:00 
		 
	
		
			
			
			
			
			
			2020-04-08 09:31:14 -07:00