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

Merge branch 'develop' into recovery-firmware

Browse Source 
# Conflicts:
#	src/CMakeLists.txt
#	src/displayapp/DisplayApp.h
#	src/systemtask/SystemTask.cpp
#	src/systemtask/SystemTask.h
This commit is contained in:
Jean-François Milants
2021-03-07 08:44:14 +01:00
parent 740b3d7b58 ada9425357
commit 9f67e6f652
559 changed files with 33795 additions and 100474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.10)
project(pinetime VERSION 0.11.0 LANGUAGES C CXX ASM)
project(pinetime VERSION 0.14.0 LANGUAGES C CXX ASM)
set(NRF_TARGET "nrf52")