projects / contrib / iotivity.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cd8dfe8 6a34b94)
Merge branch 'master' into extended-easysetup
authorJihun Ha <jihun.ha@samsung.com>
Sun, 24 Jul 2016 12:30:03 +0000 (21:30 +0900)
committerJihun Ha <jihun.ha@samsung.com>
Sun, 24 Jul 2016 12:30:03 +0000 (21:30 +0900)
Conflicts:
service/easy-setup/mediator/csdk/src/provisioning.cpp
service/easy-setup/mediator/csdk/src/provisioningapi.cpp
service/easy-setup/mediator/csdk/src/wifiprovisioning.cpp

Change-Id: I80e0b7917869577e0716516fa95d9c21c7290cc7
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>

Trivial merge
Domain: SCM / Uncategorized;