Skip to content
Snippets Groups Projects
Commit 36fc476c authored by dmitriy.gerasimov's avatar dmitriy.gerasimov
Browse files

Merge branch 'features-4577' into 'develop'

features-4577

See merge request !200
parents 8400fcdb b8aa70d1
No related branches found
No related tags found
2 merge requests!272Feature 5173,!200features-4577
......@@ -8,7 +8,7 @@ set(CMAKE_C_STANDARD 11)
SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}")
SET( CPACK_PACKAGE_VERSION_MAJOR 4)
SET( CPACK_PACKAGE_VERSION_MINOR 2)
SET( CPACK_PACKAGE_VERSION_PATCH 1)
SET( CPACK_PACKAGE_VERSION_PATCH 2)
# init CellFrame SDK
add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}\"")
......
Subproject commit c5c9a56750470e2db62a20602afde85c00195d9b
Subproject commit a548cbc6147c13909642830ed40022c93ef01e69
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