Merge branch 'upstream' into tizen 80/66480/4 accepted/tizen/common/20160422.171753 accepted/tizen/ivi/20160423.060536 accepted/tizen/mobile/20160423.055559 accepted/tizen/tv/20160423.060010 accepted/tizen/wearable/20160423.060300 submit/tizen/20160421.063352
authoryoungman <yman.jung@samsung.com>
Tue, 19 Apr 2016 06:36:04 +0000 (15:36 +0900)
committeryoungman <yman.jung@samsung.com>
Tue, 19 Apr 2016 07:54:53 +0000 (16:54 +0900)
commit7225939b069c31661c5512510fdc262ebef7b4ce
tree42ee8fe52cc1eaa0e9fef6f55cdd9123bea29c49
parent75ec5b34c2a729780be855d6f92df010a8b183d0
parent390866079e285d2c74918432c0d597d5da52f8a0
Merge branch 'upstream' into tizen

Change-Id: I5f0484c94f6b5da87c54c54e1f78eaafba10f8e1
.gitignore
build_common/external_libs.scons
extlibs/tinycbor/tinycbor/.tag
extlibs/tinycbor/tinycbor/.travis.yml
extlibs/tinycbor/tinycbor/LICENSE
extlibs/tinycbor/tinycbor/examples/simplereader.c
extlibs/tinycbor/tinycbor/src/cborparser.c
extlibs/tinycbor/tinycbor/src/extract_number_p.h
packaging/iotivity-test.manifest
packaging/iotivity.spec
resource/csdk/connectivity/lib/libcoap-4.1.1/SConscript