projects / platform / upstream / iotivity.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: db42023 f10e37b)
Merge remote-tracking branch 'origin/master' into extended-easysetup
authoruzchoi <uzchoi@samsung.com>
Mon, 18 Jul 2016 02:36:12 +0000 (11:36 +0900)
committeruzchoi <uzchoi@samsung.com>
Mon, 18 Jul 2016 02:39:09 +0000 (11:39 +0900)
Conflicts:
service/easy-setup/mediator/richsdk/src/RemoteEnrolleeResource.cpp

Change-Id: I2868246122ea799fd75111f439ed1f410f950592


Trivial merge
Domain: Network & Connectivity / IoT Connectivity;