Merge branch 'master' into easysetup 69/5069/1
authorlankamadan <lanka.madan@samsung.com>
Fri, 19 Feb 2016 02:54:31 +0000 (11:54 +0900)
committerlankamadan <lanka.madan@samsung.com>
Fri, 19 Feb 2016 02:54:31 +0000 (11:54 +0900)
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>
1  2 
build_common/SConscript
service/SConscript
service/easy-setup/enrollee/arduino/wifi/networkhandler.cpp
service/easy-setup/enrollee/src/resourcehandler.cpp
service/easy-setup/sampleapp/mediator/android/EasySetup/app/build.gradle
tools/tizen/iotivity.spec

Simple merge
index dea7af0,363f26e..50fd899
mode 100755,100644..100755