aboutsummaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorSteveAmor <SteveAmor@users.noreply.github.com>2022-01-02 22:27:43 +0000
committerSteveAmor <SteveAmor@users.noreply.github.com>2022-01-02 22:27:43 +0000
commitcc259b6a4ac93d507fa372a41ea653dedeb791ea (patch)
tree3c8b8b937b2b91149003195679ce5acda1154c4d /CMakeLists.txt
parent94561b233136334c7507925b04a345adb0e6c769 (diff)
parente0013e730448f4dc142e3610f970f22c807ac41e (diff)
resolves conflicts
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 a8ecb81f..b5880666 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.10)
-project(pinetime VERSION 1.6.0 LANGUAGES C CXX ASM)
+project(pinetime VERSION 1.7.1 LANGUAGES C CXX ASM)
set(CMAKE_C_STANDARD 99)
set(CMAKE_CXX_STANDARD 14)