projects
/
contrib
/
iotivity.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
08d5220
a73131d
)
Merge "[IOT-1785] Merge branch 'iot-1785'"
author
Greg Zaverucha
<gregz@microsoft.com>
Mon, 3 Apr 2017 21:00:53 +0000
(21:00 +0000)
committer
Gerrit Code Review
<gerrit@172.30.200.205>
Mon, 3 Apr 2017 21:00:53 +0000
(21:00 +0000)
1
2
resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c
patch
|
diff1
|
diff2
|
blob
|
history
resource/csdk/connectivity/src/camessagehandler.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c
Simple merge
diff --cc
resource/csdk/connectivity/src/camessagehandler.c
Simple merge
projects / contrib / iotivity.git / commitdiff