Merge branch 'upstream' into tizen 18/82218/1
authorYoungjae Shin <yj99.shin@samsung.com>
Tue, 2 Aug 2016 04:21:12 +0000 (13:21 +0900)
committerYoungjae Shin <yj99.shin@samsung.com>
Tue, 2 Aug 2016 04:39:19 +0000 (13:39 +0900)
commite2559281e01189185cb2d85edca592f2875d6878
treef9b97e8412210f4825157f88afbda39538f966ca
parentf5025d7067356e547eecff643d71912bf8cf008e
parent1cee1631595cac6a6394ac2e0b365c6dd5a42c68
Merge branch 'upstream' into tizen

Conflicts:
packaging/iotivity.spec

Change-Id: I0ebb075dbed68e747ac78ebfc36ef2ffb2b5a24a
iotivity.pc.in
packaging/iotivity.spec
resource/csdk/connectivity/api/cacommon.h
resource/csdk/stack/include/ocstackconfig.h
resource/csdk/stack/test/stacktests.cpp