CCF_100/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'restructure_includes' of https://github.com/NeroBurner/InfiniTime into NeroBurner-restructure_includes

Browse Source 
# Conflicts:
#	doc/contribute.md
#	src/displayapp/screens/BatteryInfo.h
This commit is contained in:
Jean-François Milants
2021-11-28 13:53:03 +01:00
parent d5e8e3ca44 3a41bff9ea
commit 298f0f4335
148 changed files with 263 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/displayapp/screens/BatteryInfo.h
View File

@@ -1,7 +1,7 @@
#pragma once
#include <cstdint>
#include "Screen.h"
#include "displayapp/screens/Screen.h"
#include <lvgl/lvgl.h>
namespace Pinetime {