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

Merge branch 'features-2844' into 'master'

features-2844

See merge request !143
parents 54b96dd4 fca29161
No related branches found
No related tags found
1 merge request!143features-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 4)
SET( CPACK_PACKAGE_VERSION_PATCH 3)
SET( CPACK_PACKAGE_VERSION_PATCH 4)
# init CellFrame SDK
add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}\"")
......
Subproject commit d26529740315bffda8b5fca78b7baedec21cfb9d
Subproject commit db9b382d599038620305ed7ee67ef8dce73fe305
Subproject commit bcf8c7a54278129bc4fc8d60db60f617cf206840
Subproject commit cfaa3c0afa73ecd3a140673d5e9a2125f9f7ba6a
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