review.tizen.org Git - platform/upstream/iotivity.git/commit

projects / platform / upstream / iotivity.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b639c4f 3e9402a)

author	Youngjae Shin <yj99.shin@samsung.com>
	Mon, 4 Jan 2016 07:23:01 +0000 (16:23 +0900)
committer	Youngjae Shin <yj99.shin@samsung.com>
	Mon, 4 Jan 2016 07:23:01 +0000 (16:23 +0900)
commit	f85d7e7587daa4ddb99f5aa2bdb6bde5a999e5d9
tree	c2969440bb4cc33ccdb64c4069179ee2baa70ce8	tree \| snapshot
parent	b639c4f1420e5412956df8c8cf40e93d8b7db8a4	commit \| diff
parent	3e9402ad71cb3e93266a77796f44d17bab9853fd	commit \| diff

Merge branch 'upstream' into tizen

Conflicts:
resource/csdk/connectivity/src/ip_adapter/caipserver.c
tools/tizen/iotivity.spec

16 files changed:

build_common/SConscript	diff1 \|	diff2 \|	blob \| history
extlibs/tinycbor/tinycbor/Makefile.configure	\|	\|	blob
extlibs/tinycbor/tinycbor/src/cborparser.c	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/src/extract_number_p.h	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/tests/parser/tst_parser.cpp	diff1 \|	\|	blob \| history
packaging/iotivity.spec	diff1 \|	\|	blob \| history
resource/c_common/SConscript	diff1 \|	diff2 \|	blob \| history
resource/csdk/SConscript	diff1 \|	diff2 \|	blob \| history
resource/csdk/connectivity/src/SConscript	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/provisioning/SConscript	diff1 \|	diff2 \|	blob \| history
resource/csdk/stack/src/ocresource.c	diff1 \|	diff2 \|	blob \| history
resource/examples/SConscript	diff1 \|	diff2 \|	blob \| history
resource/src/SConscript	diff1 \|	diff2 \|	blob \| history
service/resource-container/SConscript	diff1 \|	diff2 \|	blob \| history
service/resource-encapsulation/SConscript	diff1 \|	diff2 \|	blob \| history
service/third_party_libs.scons	diff1 \|	diff2 \|	blob \| history

Domain: Network & Connectivity / IoT Connectivity;