diff options
| author | JF <jf@codingfield.com> | 2020-07-11 21:09:34 +0200 |
|---|---|---|
| committer | JF <jf@codingfield.com> | 2020-07-11 21:09:34 +0200 |
| commit | 64c14274fc2f025fc48d3df47a1640f08eb968cd (patch) | |
| tree | 262cf8b4e84c556748f42bbf778b48a68210921d /CMakeLists.txt | |
| parent | 0bcaf9c22d6183ba8072e10abb9da7aea578b8db (diff) | |
| parent | 6309719a62436fd746a7a8b228205e93b419ca26 (diff) | |
Merge branch 'develop'
# Conflicts:
# CMakeLists.txt
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 5936f7eb..51ac2d18 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.10) -project(pinetime VERSION 0.6.2 LANGUAGES C CXX ASM) +project(pinetime VERSION 0.7.0 LANGUAGES C CXX ASM) set(NRF_TARGET "nrf52") |