projects
/
platform
/
upstream
/
iotivity.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
193ac14
586aa49
)
Merge branch 'master' into cloud-interface
author
Jee Hyeok Kim
<jihyeok13.kim@samsung.com>
Fri, 26 Feb 2016 06:06:51 +0000
(15:06 +0900)
committer
Jee Hyeok Kim
<jihyeok13.kim@samsung.com>
Fri, 26 Feb 2016 06:10:22 +0000
(15:10 +0900)
Change-Id: Ifa74665a1750fb1671a8035f7321557cd6d2403f
Signed-off-by: jk13 <jihyeok13.kim@samsung.com>
1
2
resource/csdk/security/SConscript
patch
|
diff1
|
diff2
|
blob
|
history
resource/csdk/security/include/internal/srmresourcestrings.h
patch
|
diff1
|
diff2
|
blob
|
history
resource/csdk/security/include/securevirtualresourcetypes.h
patch
|
diff1
|
diff2
|
blob
|
history
resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.json
patch
|
diff1
|
diff2
|
blob
|
history
resource/csdk/security/provisioning/src/pmutility.c
patch
|
diff1
|
diff2
|
blob
|
history
resource/csdk/security/src/iotvticalendar.c
patch
|
diff1
|
diff2
|
blob
|
history
resource/csdk/security/src/srmresourcestrings.c
patch
|
diff1
|
diff2
|
blob
|
history
resource/csdk/security/unittest/iotvticalendartest.cpp
patch
|
diff1
|
diff2
|
blob
|
history
resource/csdk/stack/src/ocstack.c
patch
|
diff1
|
diff2
|
blob
|
history
service/resource-encapsulation/examples/linux/SampleResourceClient.cpp
patch
|
diff1
|
diff2
|
blob
|
history
service/resource-encapsulation/src/resourceClient/RCSDiscoveryManager.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
resource/csdk/security/SConscript
index
033a4d7
,
276c2b3
..
276c2b3
mode 100644,100755..100644
---
1
/
resource/csdk/security/SConscript
---
2
/
resource/csdk/security/SConscript
+++ b/
resource/csdk/security/SConscript
diff --cc
resource/csdk/security/include/internal/srmresourcestrings.h
index
9974717
,
1ac3fb0
..
1ac3fb0
mode 100644,100755..100644
---
1
/
resource/csdk/security/include/internal/srmresourcestrings.h
---
2
/
resource/csdk/security/include/internal/srmresourcestrings.h
+++ b/
resource/csdk/security/include/internal/srmresourcestrings.h
diff --cc
resource/csdk/security/include/securevirtualresourcetypes.h
index
2f69026
,
83dc60f
..
83dc60f
mode 100644,100755..100644
---
1
/
resource/csdk/security/include/securevirtualresourcetypes.h
---
2
/
resource/csdk/security/include/securevirtualresourcetypes.h
+++ b/
resource/csdk/security/include/securevirtualresourcetypes.h
diff --cc
resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.json
index
a3a4b6f
,
a79a2b2
..
a79a2b2
mode 100644,100755..100644
---
1
/
resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.json
---
2
/
resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.json
+++ b/
resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.json
diff --cc
resource/csdk/security/provisioning/src/pmutility.c
index
0f46c36
,
2e4158b
..
2e4158b
mode 100644,100755..100644
---
1
/
resource/csdk/security/provisioning/src/pmutility.c
---
2
/
resource/csdk/security/provisioning/src/pmutility.c
+++ b/
resource/csdk/security/provisioning/src/pmutility.c
diff --cc
resource/csdk/security/src/iotvticalendar.c
index
8276365
,
0692cd9
..
0692cd9
mode 100644,100755..100644
---
1
/
resource/csdk/security/src/iotvticalendar.c
---
2
/
resource/csdk/security/src/iotvticalendar.c
+++ b/
resource/csdk/security/src/iotvticalendar.c
diff --cc
resource/csdk/security/src/srmresourcestrings.c
index
4cca17b
,
be72bf3
..
be72bf3
mode 100644,100755..100644
---
1
/
resource/csdk/security/src/srmresourcestrings.c
---
2
/
resource/csdk/security/src/srmresourcestrings.c
+++ b/
resource/csdk/security/src/srmresourcestrings.c
diff --cc
resource/csdk/security/unittest/iotvticalendartest.cpp
index
2d207cd
,
7a4c659
..
7a4c659
mode 100644,100755..100644
---
1
/
resource/csdk/security/unittest/iotvticalendartest.cpp
---
2
/
resource/csdk/security/unittest/iotvticalendartest.cpp
+++ b/
resource/csdk/security/unittest/iotvticalendartest.cpp
diff --cc
resource/csdk/stack/src/ocstack.c
index
654b785
,
0dda57c
..
0dda57c
mode 100644,100755..100644
---
1
/
resource/csdk/stack/src/ocstack.c
---
2
/
resource/csdk/stack/src/ocstack.c
+++ b/
resource/csdk/stack/src/ocstack.c
diff --cc
service/resource-encapsulation/examples/linux/SampleResourceClient.cpp
index
b905977
,
61287a0
..
61287a0
mode 100644,100755..100644
---
1
/
service/resource-encapsulation/examples/linux/SampleResourceClient.cpp
---
2
/
service/resource-encapsulation/examples/linux/SampleResourceClient.cpp
+++ b/
service/resource-encapsulation/examples/linux/SampleResourceClient.cpp
diff --cc
service/resource-encapsulation/src/resourceClient/RCSDiscoveryManager.cpp
index
7e19d4d
,
007d49c
..
007d49c
mode 100644,100755..100644
---
1
/
service/resource-encapsulation/src/resourceClient/RCSDiscoveryManager.cpp
---
2
/
service/resource-encapsulation/src/resourceClient/RCSDiscoveryManager.cpp
+++ b/
service/resource-encapsulation/src/resourceClient/RCSDiscoveryManager.cpp