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

projects / platform / upstream / iotivity.git / commit

author	youngman <yman.jung@samsung.com>
	Wed, 2 Nov 2016 10:39:42 +0000 (19:39 +0900)
committer	youngman <yman.jung@samsung.com>
	Wed, 2 Nov 2016 10:56:53 +0000 (19:56 +0900)
commit	662d4aaa7778dfee95adc06f024862634e8d8c94
tree	82a37771d3eace75beebd37c00ba17e5f405f585	tree \| snapshot
parent	36f65169786de1cc6a8989fb637e3871271f043c	commit \| diff
parent	94651923bf67705c1b4bd61ab251e8c598d2a807	commit \| diff

Merge branch 'upstream' into tizen

Change-Id: I1951f3900d9ed347f49553ec7b4beffcebc7ff35

39 files changed:

.gbs.conf	\|	diff2 \|	blob \| history
.gitignore	diff1 \|	diff2 \|	blob \| history
build_common/SConscript	diff1 \|	diff2 \|	blob \| history
extlibs/tinycbor/tinycbor/.gitattributes	\|	\|	blob
extlibs/tinycbor/tinycbor/.gitignore	\|	\|	blob
extlibs/tinycbor/tinycbor/.tag	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/.travis.yml	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/Doxyfile	\|	\|	blob
extlibs/tinycbor/tinycbor/Makefile	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/Makefile.configure	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/VERSION	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/src/cbor.dox	\|	\|	blob
extlibs/tinycbor/tinycbor/src/cbor.h	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/src/cborconstants_p.h	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/src/cborencoder.c	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/src/cborencoder_close_container_checked.c	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/src/cborerrorstrings.c	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/src/cborjson.h	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/src/cborparser.c	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/src/cborparser_dup_string.c	\|	\|	blob
extlibs/tinycbor/tinycbor/src/cborpretty.c	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/src/cbortojson.c	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/src/compilersupport_p.h	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/src/extract_number_p.h	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/src/math_support_p.h	\|	\|	blob
extlibs/tinycbor/tinycbor/src/open_memstream.c	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/src/src.pri	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/src/tinycbor.pro	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/tests/.gitignore	\|	\|	blob
extlibs/tinycbor/tinycbor/tests/cpp/tst_cpp.cpp	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/tests/encoder/encoder.pro	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/tests/encoder/tst_encoder.cpp	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/tests/parser/parser.pro	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/tests/parser/tst_parser.cpp	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/tests/tests.pro	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/tests/tojson/tojson.pro	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/tools/Makefile	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/tools/cbordump/cbordump.c	diff1 \|	\|	blob \| history
tools/tizen/iotivity.spec	diff1 \|	diff2 \|	blob \| history

Domain: Network & Connectivity / IoT Connectivity;

RSS Atom

.gbs.conf	\|	diff2 \|	blob \| history
.gitignore	diff1 \|	diff2 \|	blob \| history
build_common/SConscript	diff1 \|	diff2 \|	blob \| history
extlibs/tinycbor/tinycbor/.gitattributes	\|	\|	blob
extlibs/tinycbor/tinycbor/.gitignore	\|	\|	blob
extlibs/tinycbor/tinycbor/.tag	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/.travis.yml	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/Doxyfile	\|	\|	blob
extlibs/tinycbor/tinycbor/Makefile	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/Makefile.configure	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/VERSION	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/src/cbor.dox	\|	\|	blob
extlibs/tinycbor/tinycbor/src/cbor.h	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/src/cborconstants_p.h	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/src/cborencoder.c	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/src/cborencoder_close_container_checked.c	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/src/cborerrorstrings.c	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/src/cborjson.h	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/src/cborparser.c	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/src/cborparser_dup_string.c	\|	\|	blob
extlibs/tinycbor/tinycbor/src/cborpretty.c	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/src/cbortojson.c	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/src/compilersupport_p.h	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/src/extract_number_p.h	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/src/math_support_p.h	\|	\|	blob
extlibs/tinycbor/tinycbor/src/open_memstream.c	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/src/src.pri	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/src/tinycbor.pro	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/tests/.gitignore	\|	\|	blob
extlibs/tinycbor/tinycbor/tests/cpp/tst_cpp.cpp	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/tests/encoder/encoder.pro	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/tests/encoder/tst_encoder.cpp	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/tests/parser/parser.pro	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/tests/parser/tst_parser.cpp	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/tests/tests.pro	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/tests/tojson/tojson.pro	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/tools/Makefile	diff1 \|	\|	blob \| history
extlibs/tinycbor/tinycbor/tools/cbordump/cbordump.c	diff1 \|	\|	blob \| history
tools/tizen/iotivity.spec	diff1 \|	diff2 \|	blob \| history