aboutsummaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorKieran Cawthray <kieranc@gmail.com>2021-06-20 21:46:51 +0200
committerKieran Cawthray <kieranc@gmail.com>2021-06-20 21:46:51 +0200
commitb130ffa39cef1ddca5e81d83e03bf0ade66a1458 (patch)
treee80854384d74536ce6721c7484f91b4af537b2fe /CMakeLists.txt
parentd7b73f11823a988e31287551887940e6683f1aee (diff)
parent20a24f8cf56551eae1202f8dc5733bd0cf61adbf (diff)
Merge remote-tracking branch 'upstream/develop' into pinetimestyle
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1a488eaa..f2e467e9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.10)
-project(pinetime VERSION 1.1.0 LANGUAGES C CXX ASM)
+project(pinetime VERSION 1.2.0 LANGUAGES C CXX ASM)
set(CMAKE_C_STANDARD 99)
set(CMAKE_CXX_STANDARD 14)