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

Merge branch 'support-5685' into 'develop'

support-5685

See merge request !380
parents b1c2f3ba ff52c9b3
No related branches found
No related tags found
No related merge requests found
......@@ -8,7 +8,7 @@ set(CMAKE_C_STANDARD 11)
SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}")
SET( CPACK_PACKAGE_VERSION_MAJOR 5)
SET( CPACK_PACKAGE_VERSION_MINOR 1)
SET( CPACK_PACKAGE_VERSION_PATCH 2)
SET( CPACK_PACKAGE_VERSION_PATCH 3)
if (CMAKE_TARGET_ARCH MATCHES arm)
SET( CPACK_PACKAGE_ARCHITECTURE "${CMAKE_TARGET_ARCH}")
......
Subproject commit a73a7c7dd8937bdb3ceedc30894e1c31cf68af06
Subproject commit 4fd24fd2ac8aa17ce7a39633cdb4fc03e750e346
Subproject commit 4eb59ab07da4239366cffa1e3f60d5642cbb4e53
Subproject commit f69ecb2cc2c44ff6b31ccec7e311df02a7128ef8
......@@ -144,9 +144,6 @@ void exit_if_server_already_running( void );
static const char *s_pid_file_path = NULL;
bool dap_chain_net_srv_pay_verificator(dap_chain_tx_out_cond_t *a_cond, dap_chain_datum_tx_t *a_tx, bool a_owner)
{ UNUSED(a_cond); UNUSED(a_tx); UNUSED(a_owner); return true; }
#ifdef __ANDROID__
int cellframe_node_Main(int argc, const char **argv)
#else
......
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