Jean-François Milants
							
						 
					 | 
					
						
						
						
						
							
						
						
							5845fd98ba
							
						
					 | 
					
						
						
							
							Add submodule again...
						
						
						
						
						
						
					 | 
					
						2021-03-07 09:15:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jean-François Milants
							
						 
					 | 
					
						
						
						
						
							
						
						
							c083916f33
							
						
					 | 
					
						
						
							
							Revert "Add submodule again..."
						
						
						
						
						
						
						
						This reverts commit 15484d0b34099b50c300b6f76e23f70f171bb409. 
						
						
					 | 
					
						2021-03-07 09:08:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jean-François Milants
							
						 
					 | 
					
						
						
						
						
							
						
						
							15484d0b34
							
						
					 | 
					
						
						
							
							Add submodule again...
						
						
						
						
						
						
					 | 
					
						2021-03-07 08:50:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jean-François Milants
							
						 
					 | 
					
						
						
						
						
							
						
						
							9f67e6f652
							
						
					 | 
					
						
						
							
							Merge branch 'develop' into recovery-firmware
						
						
						
						
						
						
						
						# Conflicts:
#	src/CMakeLists.txt
#	src/displayapp/DisplayApp.h
#	src/systemtask/SystemTask.cpp
#	src/systemtask/SystemTask.h 
						
						
					 | 
					
						2021-03-07 08:44:14 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joaquim
							
						 
					 | 
					
						
						
						
						
							
						
						
							efa99da44d
							
						
					 | 
					
						
						
							
							LVGL V7 Upgrade
						
						
						
						
						
						
					 | 
					
						2021-01-28 17:07:28 +00:00 | 
					
					
						
						
							
							
							
						
					 |