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

Merge branch 'features-4616-d' into 'develop' 

features-4616

See merge request !205
parents f6620e3e 083f3f31
No related branches found
No related tags found
2 merge requests!272Feature 5173,!205features-4616
Hide whitespace changes
Inline Side-by-side
CMakeLists.txt
+ 1
− 1
View file @ b7eda226
......@@ -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 4)
SET( CPACK_PACKAGE_VERSION_PATCH 5)
# init CellFrame SDK
add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}-${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\"")
......
cellframe-sdk @ 32ce51a5
Compare 3a2b60a6...32ce51a5
Subproject commit 3a2b60a6d80921c64141fed8c07246f10d1d2837
Subproject commit 32ce51a54c8650e6cbe888b645d29273ab146019
dap-sdk @ 80cf6b34
Compare a83c88fc...80cf6b34
Subproject commit a83c88fcd1a9d89a825d9513d58beac200d3433a
Subproject commit 80cf6b34ce655b63dc045af234199e61a08ebf28
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment