From: Sooyoung Ha <yoosah.ha@samsung.com>
Date: Thu, 9 Mar 2017 06:25:53 +0000 (+0900)
Subject: Merge branch 'tizen_3.0' into tizen
X-Git-Tag: accepted/tizen/common/20170403.190620~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F92%2F118192%2F1;p=sdk%2Ftarget%2Fsdbd.git

Merge branch 'tizen_3.0' into tizen

Change-ID: I364987d6b02d4538753a9b924fbd6769878510b3
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>
---

54dcaaf89d7969489a1e5ba9385f730005fd01da
diff --cc CMakeLists.txt
index e16df2d,64c56f9..64c56f9
mode 100755,100644..100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
diff --cc src/sdb.c
index a07a881,5c6b2d5..5c6b2d5
mode 100755,100644..100755
--- a/src/sdb.c
+++ b/src/sdb.c
diff --cc src/sdb.h
index 226da64,0fe7005..0fe7005
mode 100755,100644..100755
--- a/src/sdb.h
+++ b/src/sdb.h
diff --cc src/sdbd_plugin.h
index e98ef69,0a9287a..0a9287a
mode 100755,100644..100755
--- a/src/sdbd_plugin.h
+++ b/src/sdbd_plugin.h
diff --cc src/transport.c
index 7811628,8d889e3..8d889e3
mode 100755,100644..100755
--- a/src/transport.c
+++ b/src/transport.c