Skip to content
Snippets Groups Projects
Commit 05cb3897 authored by Roman Khlopkov's avatar Roman Khlopkov 🔜
Browse files

Conflicts resolving

parents 9d68ce6b e4154cac
No related branches found
No related tags found
1 merge request!139features-2844
......@@ -8,7 +8,7 @@ set(CMAKE_C_STANDARD 11)
SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}")
SET( CPACK_PACKAGE_VERSION_MAJOR 3)
SET( CPACK_PACKAGE_VERSION_MINOR 3)
SET( CPACK_PACKAGE_VERSION_PATCH 8)
SET( CPACK_PACKAGE_VERSION_PATCH 9)
# init CellFrame SDK
add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}\"")
......
Subproject commit 35710f784a4f37a822c53c7c4b4a4ab5d26d1265
Subproject commit 7a9f4aee86ee45995a0b33425f2faf531f5393a4
Subproject commit ce2cc96fe1b6405dada650bb0a992d58ee305a5e
Subproject commit fbb50e65fec326cd6ea2b47ebebbe5aad8feba39
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment