projects
/
contrib
/
iotivity.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e822a22
1d9eb84
)
Merge branch 'master' into windows-port
author
David Antler
<david.a.antler@intel.com>
Mon, 13 Jun 2016 21:33:25 +0000
(14:33 -0700)
committer
David Antler
<david.a.antler@intel.com>
Mon, 13 Jun 2016 21:33:31 +0000
(14:33 -0700)
Change-Id: Ia2e02ce01d3cb8b73b22f7c2ff4169c340d6f72f
Signed-off-by: David Antler <david.a.antler@intel.com>
12 files changed:
1
2
resource/csdk/connectivity/src/adapter_util/caadapternetdtls.c
patch
|
diff1
|
diff2
|
blob
|
history
resource/csdk/security/provisioning/src/ownershiptransfermanager.c
patch
|
diff1
|
diff2
|
blob
|
history
resource/csdk/security/src/aclresource.c
patch
|
diff1
|
diff2
|
blob
|
history
resource/csdk/security/unittest/aclresourcetest.cpp
patch
|
diff1
|
diff2
|
blob
|
history
resource/csdk/stack/include/octypes.h
patch
|
diff1
|
diff2
|
blob
|
history
resource/csdk/stack/include/payload_logging.h
patch
|
diff1
|
diff2
|
blob
|
history
resource/csdk/stack/src/ocpayload.c
patch
|
diff1
|
diff2
|
blob
|
history
resource/csdk/stack/src/ocpayloadconvert.c
patch
|
diff1
|
diff2
|
blob
|
history
resource/csdk/stack/src/ocpayloadparse.c
patch
|
diff1
|
diff2
|
blob
|
history
resource/csdk/stack/test/stacktests.cpp
patch
|
diff1
|
diff2
|
blob
|
history
resource/include/OCRepresentation.h
patch
|
diff1
|
diff2
|
blob
|
history
resource/src/OCRepresentation.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
resource/csdk/connectivity/src/adapter_util/caadapternetdtls.c
Simple merge
diff --cc
resource/csdk/security/provisioning/src/ownershiptransfermanager.c
Simple merge
diff --cc
resource/csdk/security/src/aclresource.c
Simple merge
diff --cc
resource/csdk/security/unittest/aclresourcetest.cpp
Simple merge
diff --cc
resource/csdk/stack/include/octypes.h
Simple merge
diff --cc
resource/csdk/stack/include/payload_logging.h
Simple merge
diff --cc
resource/csdk/stack/src/ocpayload.c
Simple merge
diff --cc
resource/csdk/stack/src/ocpayloadconvert.c
Simple merge
diff --cc
resource/csdk/stack/src/ocpayloadparse.c
Simple merge
diff --cc
resource/csdk/stack/test/stacktests.cpp
Simple merge
diff --cc
resource/include/OCRepresentation.h
Simple merge
diff --cc
resource/src/OCRepresentation.cpp
Simple merge