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

projects / platform / upstream / iotivity.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 193ac14 586aa49)

author	Jee Hyeok Kim <jihyeok13.kim@samsung.com>
	Fri, 26 Feb 2016 06:06:51 +0000 (15:06 +0900)
committer	Jee Hyeok Kim <jihyeok13.kim@samsung.com>
	Fri, 26 Feb 2016 06:10:22 +0000 (15:10 +0900)
commit	45c364268c4f5d575d98f4cd88b571b536c6cb17
tree	7f4b7d95e1237c4f05d202781d860b6786cc41b5	tree \| snapshot
parent	193ac144d877c161b7118152671693b1c420060f	commit \| diff
parent	586aa4993a002dcd453846102d212086c8c78111	commit \| diff

Merge branch 'master' into cloud-interface

Change-Id: Ifa74665a1750fb1671a8035f7321557cd6d2403f
Signed-off-by: jk13 <jihyeok13.kim@samsung.com>

resource/csdk/security/SConscript	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/include/internal/srmresourcestrings.h	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/include/securevirtualresourcetypes.h	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.json	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/provisioning/src/pmutility.c	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/src/iotvticalendar.c	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/src/srmresourcestrings.c	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/unittest/iotvticalendartest.cpp	diff1 \|	diff2 \|	blob \| history
resource/csdk/stack/src/ocstack.c	diff1 \|	diff2 \|	blob \| history
service/resource-encapsulation/examples/linux/SampleResourceClient.cpp	diff1 \|	diff2 \|	blob \| history
service/resource-encapsulation/src/resourceClient/RCSDiscoveryManager.cpp	diff1 \|	diff2 \|	blob \| history

Domain: Network & Connectivity / IoT Connectivity;