diff options
| author | Jean-François Milants <jf@codingfield.com> | 2021-03-07 08:44:14 +0100 |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2021-03-07 08:44:14 +0100 |
| commit | 9f67e6f6525bd4071609ff9edd6ce132d7ca1464 (patch) | |
| tree | 65b2dc22bb257c6dd4fc8be77762173b564c340c /CMakeLists.txt | |
| parent | 740b3d7b58dd92a6a6f99620a090ae4f05c03299 (diff) | |
| parent | ada942535718d48eec37cca4f50d678e7201dc67 (diff) | |
Merge branch 'develop' into recovery-firmware
# Conflicts:
# src/CMakeLists.txt
# src/displayapp/DisplayApp.h
# src/systemtask/SystemTask.cpp
# src/systemtask/SystemTask.h
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c35215e..c63d169a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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") |