Merge branch 'combine_datetime'
This commit is contained in:
		
						commit
						168ff53cb4
					
				@ -1 +1 @@
 | 
			
		||||
Subproject commit b56c5f25f077d17b23677cdd0d4dc247ce7c421f
 | 
			
		||||
Subproject commit a7f8b59bfb1641dea7f30a267c6bf7e882d9edbf
 | 
			
		||||
@ -99,11 +99,8 @@ Missing::Missing(Pinetime::Applications::DisplayApp* app, Pinetime::Applications
 | 
			
		||||
    case Pinetime::Applications::Apps::SettingSteps:
 | 
			
		||||
      screen_lbl = "SettingSteps";
 | 
			
		||||
      break;
 | 
			
		||||
    case Pinetime::Applications::Apps::SettingSetDate:
 | 
			
		||||
      screen_lbl = "SettingSetDate";
 | 
			
		||||
      break;
 | 
			
		||||
    case Pinetime::Applications::Apps::SettingSetTime:
 | 
			
		||||
      screen_lbl = "SettingSetTime";
 | 
			
		||||
    case Pinetime::Applications::Apps::SettingSetDateTime:
 | 
			
		||||
      screen_lbl = "SettingSetDateTime";
 | 
			
		||||
      break;
 | 
			
		||||
    case Pinetime::Applications::Apps::SettingChimes:
 | 
			
		||||
      screen_lbl = "SettingChimes";
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user