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

projects / platform / upstream / iotivity.git / commit

author	lankamadan <lanka.madan@samsung.com>
	Fri, 19 Feb 2016 02:54:31 +0000 (11:54 +0900)
committer	lankamadan <lanka.madan@samsung.com>
	Fri, 19 Feb 2016 02:54:31 +0000 (11:54 +0900)
commit	3e08f0b76cfa2aebd58a6acd4d8a6ae64c5d3cf4
tree	930606dfcfd9e63315c3d9b0ae67c4a07669e71b	tree \| snapshot
parent	e11d7991ba89c05ae25739f2c494e3876659284d	commit \| diff
parent	3461813ef2dcccc04a822b0f2161692d2d7e2c2e	commit \| diff

Merge branch 'master' into easysetup

Conflicts:
service/easy-setup/enrollee/src/resourcehandler.cpp
service/easy-setup/mediator/csdk/src/provisioning.cpp
service/easy-setup/mediator/richsdk/android/EasySetupCore/build.gradle
service/easy-setup/sampleapp/enrollee/arduino/enrolleewifi.cpp
service/easy-setup/sampleapp/mediator/android/EasySetup/app/build.gradle
service/easy-setup/sdk/enrollee/src/easysetup.cpp

Change-Id: Ia4fc8d02ebdadc1f71c2b0e40d39d7ad66ba682c
Signed-off-by: lankamadan <lanka.madan@samsung.com>

Domain: Network & Connectivity / IoT Connectivity;

RSS Atom

build_common/SConscript	diff1 \|	diff2 \|	blob \| history
service/SConscript	diff1 \|	diff2 \|	blob \| history
service/easy-setup/enrollee/arduino/wifi/networkhandler.cpp	diff1 \|	diff2 \|	blob \| history
service/easy-setup/enrollee/src/resourcehandler.cpp	diff1 \|	diff2 \|	blob \| history
service/easy-setup/sampleapp/mediator/android/EasySetup/app/build.gradle	diff1 \|	diff2 \|	blob \| history
tools/tizen/iotivity.spec	diff1 \|	diff2 \|	blob \| history