projects
/
platform
/
core
/
security
/
suspicious-activity-monitor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fddf6a8
94c1e9c
)
Merge branch 'netagent' into iotivity-1.3.0
author
Andriy Gudz
<a.gudz@samsung.com>
Wed, 7 Jun 2017 11:47:14 +0000
(14:47 +0300)
committer
Andriy Gudz
<a.gudz@samsung.com>
Wed, 7 Jun 2017 11:47:14 +0000
(14:47 +0300)
1
2
device_core/secserver/notification_resource.cpp
patch
|
diff1
|
diff2
|
blob
|
history
device_core/secserver/policy_resource.cpp
patch
|
diff1
|
diff2
|
blob
|
history
device_core/secserver/report_resource.cpp
patch
|
diff1
|
diff2
|
blob
|
history
device_core/utest/CMakeLists.txt
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
device_core/secserver/notification_resource.cpp
Simple merge
diff --cc
device_core/secserver/policy_resource.cpp
Simple merge
diff --cc
device_core/secserver/report_resource.cpp
Simple merge
diff --cc
device_core/utest/CMakeLists.txt
index
64fd42e
,
1446fd7
..
ee5ae50
---
1
/
device_core/utest/CMakeLists.txt
---
2
/
device_core/utest/CMakeLists.txt
+++ b/
device_core/utest/CMakeLists.txt
@@@
-22,10
-22,10
+22,10
@@@
add_executable (${PROJECT_NAME} ${SRCS}
target_link_libraries(${PROJECT_NAME}
${GTEST_LIB}
pthread
- boost_system boost_thread
+
#
boost_system boost_thread
c_common oc octbstack oc_logger resource_directory connectivity_abstraction
- ESEnrolleeSDK
-
#
ESMediatorRich
+
ESEnrolleeSDK
+
ESMediatorRich
${CTRL_APP_LIB_PROJECT_NAME}
${AGENT_LIB_PROJECT_NAME}
jsoncpp