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

projects / platform / upstream / iotivity.git / commit

author	DoHyun Pyun <dh79.pyun@samsung.com>
	Wed, 12 Dec 2018 04:07:46 +0000 (13:07 +0900)
committer	DoHyun Pyun <dh79.pyun@samsung.com>
	Wed, 12 Dec 2018 04:07:46 +0000 (13:07 +0900)
commit	847996e6e5e387e38b7f56814016632d62f0cfe7
tree	8ad660b590bba81a6e60987a24e4d374d5d7bef6	tree \| snapshot
parent	7e5046079bc8c38470e79aa686091ec18b9c0dd8	commit \| diff

Merge tizen_5.0 codes into tizen_4.0

Change-Id: If56f871c86a24372cf63fe2ff42055ffbbd72fe6
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

56 files changed:

android/android_api/base/jni/Android.mk		diff \| blob \| history
android/android_api/base/jni/JniListenerManager.h		diff \| blob \| history
android/android_api/base/jni/JniOcAccountManager.cpp		diff \| blob \| history
android/android_api/base/jni/JniOcPlatform.cpp		diff \| blob \| history
android/android_api/base/jni/JniOcResource.cpp		diff \| blob \| history
android/android_api/base/jni/JniOcResource.h		diff \| blob \| history
android/android_api/base/jni/JniOcStack.h		diff \| blob \| history
android/android_api/base/jni/JniOnDeleteListener.cpp		diff \| blob \| history
android/android_api/base/jni/JniOnDeleteListener.h		diff \| blob \| history
android/android_api/base/jni/JniOnGetListener.cpp		diff \| blob \| history
android/android_api/base/jni/JniOnGetListener.h		diff \| blob \| history
android/android_api/base/jni/JniOnMQSubscribeListener.cpp		diff \| blob \| history
android/android_api/base/jni/JniOnMQSubscribeListener.h		diff \| blob \| history
android/android_api/base/jni/JniOnMQTopicFoundListener.cpp		diff \| blob \| history
android/android_api/base/jni/JniOnMQTopicFoundListener.h		diff \| blob \| history
android/android_api/base/jni/JniOnObserveListener.cpp		diff \| blob \| history
android/android_api/base/jni/JniOnObserveListener.h		diff \| blob \| history
android/android_api/base/jni/JniOnPostListener.cpp		diff \| blob \| history
android/android_api/base/jni/JniOnPostListener.h		diff \| blob \| history
android/android_api/base/jni/JniOnPutListener.cpp		diff \| blob \| history
android/android_api/base/jni/JniOnPutListener.h		diff \| blob \| history
packaging/snapshot_history.txt		diff \| blob \| history
resource/csdk/connectivity/api/casecurityinterface.h		diff \| blob \| history
resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c		diff \| blob \| history
resource/csdk/connectivity/src/bt_le_adapter/caleadapter.c		diff \| blob \| history
resource/csdk/connectivity/src/bt_le_adapter/tizen/SConscript		diff \| blob \| history
resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient.c		diff \| blob \| history
resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient.h		diff \| blob \| history
resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient_vd.c	[new file with mode: 0644]	blob
resource/csdk/connectivity/src/bt_le_adapter/tizen/caleserver_vd.c		diff \| blob \| history
resource/csdk/security/include/internal/doxmresource.h		diff \| blob \| history
resource/csdk/security/include/internal/secureresourcemanager.h		diff \| blob \| history
resource/csdk/security/include/oxmverifycommon.h		diff \| blob \| history
resource/csdk/security/provisioning/include/internal/ownershiptransfermanager.h		diff \| blob \| history
resource/csdk/security/provisioning/include/ocprovisioningmanager.h		diff \| blob \| history
resource/csdk/security/provisioning/sample/provisioningclient.c		diff \| blob \| history
resource/csdk/security/provisioning/sample/sampleserver_mfg.cpp		diff \| blob \| history
resource/csdk/security/provisioning/sample/subownerclient.c		diff \| blob \| history
resource/csdk/security/provisioning/src/ownershiptransfermanager.c		diff \| blob \| history
resource/csdk/security/provisioning/src/secureresourceprovider.c		diff \| blob \| history
resource/csdk/security/src/credresource.c		diff \| blob \| history
resource/csdk/security/src/doxmresource.c		diff \| blob \| history
resource/csdk/security/src/pconfresource.c		diff \| blob \| history
resource/csdk/security/src/pkix_interface.c		diff \| blob \| history
resource/csdk/security/src/pstatresource.c		diff \| blob \| history
resource/csdk/security/src/secureresourcemanager.c		diff \| blob \| history
resource/csdk/security/src/srmutility.c		diff \| blob \| history
resource/csdk/stack/include/ocpresence.h		diff \| blob \| history
resource/csdk/stack/include/ocstack.h		diff \| blob \| history
resource/csdk/stack/include/octypes.h		diff \| blob \| history
resource/csdk/stack/include/oickeepalive.h		diff \| blob \| history
resource/csdk/stack/include/payload_logging.h		diff \| blob \| history
resource/csdk/stack/src/ocstack.c		diff \| blob \| history
resource/csdk/stack/src/oickeepalive.c		diff \| blob \| history
resource/src/InProcClientWrapper.cpp		diff \| blob \| history
service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/JniJvm.h		diff \| blob \| history

Domain: Network & Connectivity / IoT Connectivity;

RSS Atom