Merge branch 'master' into 'feature-3805'
# Conflicts: # dap-sdk/net/core/dap_events_socket.c # modules/net/dap_chain_node_cli.c # modules/net/dap_chain_node_cli_cmd.c # modules/net/srv/dap_chain_net_srv_common.c # modules/service/vpn/CMakeLists.txt # modules/service/vpn/dap_chain_net_srv_vpn.c # modules/service/vpn/dap_chain_net_srv_vpn_cdb.c # modules/service/vpn/dap_chain_net_srv_vpn_cdb_auth.c # modules/service/vpn/dap_chain_net_srv_vpn_cdb_server_list.c # modules/service/vpn/include/dap_chain_net_srv_vpn_cdb_auth.h
No related branches found
No related tags found
Showing
- 3rdparty/cuttdb/CMakeLists.txt 1 addition, 1 deletion3rdparty/cuttdb/CMakeLists.txt
- 3rdparty/cuttdb/src/cdb_core.c 8 additions, 6 deletions3rdparty/cuttdb/src/cdb_core.c
- 3rdparty/cuttdb/src/cdb_hashtable.c 1 addition, 1 deletion3rdparty/cuttdb/src/cdb_hashtable.c
- 3rdparty/cuttdb/src/vio_apnd2.c 21 additions, 21 deletions3rdparty/cuttdb/src/vio_apnd2.c
- 3rdparty/monero_crypto/CMakeLists.txt 20 additions, 34 deletions3rdparty/monero_crypto/CMakeLists.txt
- CMakeLists.txt 19 additions, 3 deletionsCMakeLists.txt
- cmake/OS_Detection.cmake 18 additions, 12 deletionscmake/OS_Detection.cmake
- dap-sdk/core/CMakeLists.txt 1 addition, 52 deletionsdap-sdk/core/CMakeLists.txt
- dap-sdk/core/include/dap_binary_tree.h 50 additions, 0 deletionsdap-sdk/core/include/dap_binary_tree.h
- dap-sdk/core/include/dap_common.h 11 additions, 2 deletionsdap-sdk/core/include/dap_common.h
- dap-sdk/core/include/dap_math_ops.h 12 additions, 2 deletionsdap-sdk/core/include/dap_math_ops.h
- dap-sdk/core/libdap.pri 8 additions, 1 deletiondap-sdk/core/libdap.pri
- dap-sdk/core/src/dap_binary_tree.c 203 additions, 0 deletionsdap-sdk/core/src/dap_binary_tree.c
- dap-sdk/core/src/dap_common.c 104 additions, 13 deletionsdap-sdk/core/src/dap_common.c
- dap-sdk/core/src/unix/linux/linux.pri 1 addition, 0 deletionsdap-sdk/core/src/unix/linux/linux.pri
- dap-sdk/crypto/CMakeLists.txt 3 additions, 22 deletionsdap-sdk/crypto/CMakeLists.txt
- dap-sdk/crypto/include/dap_cert.h 38 additions, 2 deletionsdap-sdk/crypto/include/dap_cert.h
- dap-sdk/crypto/include/dap_cert_file.h 5 additions, 0 deletionsdap-sdk/crypto/include/dap_cert_file.h
- dap-sdk/crypto/include/dap_enc_newhope.h 85 additions, 0 deletionsdap-sdk/crypto/include/dap_enc_newhope.h
- dap-sdk/crypto/include/dap_sign.h 2 additions, 0 deletionsdap-sdk/crypto/include/dap_sign.h
Loading
Please register or sign in to comment