From: SangJin Kim <sangjin3.kim@samsung.com>
Date: Wed, 4 Jan 2017 05:42:59 +0000 (+0900)
Subject: Merge branch 'tizen_3.0' into tizen
X-Git-Tag: accepted/tizen/common/20170104.073233^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=09b79aaeff0ee445aa47404d8dc9d4990fad0ab4;p=sdk%2Ftarget%2Fsdbd.git

Merge branch 'tizen_3.0' into tizen

Change-Id: I700aec60ab37b0f533572483b0048d60fb1622bb
Signed-off-by: SangJin Kim <sangjin3.kim@samsung.com>
---

09b79aaeff0ee445aa47404d8dc9d4990fad0ab4
diff --cc CMakeLists.txt
index 43b43b8,e16df2d..e16df2d
mode 100644,100644..100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
diff --cc src/sdb.c
index 1bd095e,a07a881..a07a881
mode 100644,100644..100755
--- a/src/sdb.c
+++ b/src/sdb.c
diff --cc src/sdb.h
index f3d8d98,226da64..226da64
mode 100644,100644..100755
--- a/src/sdb.h
+++ b/src/sdb.h
diff --cc src/sdbd_plugin.h
index 0ffe5e5,e98ef69..e98ef69
mode 100644,100644..100755
--- a/src/sdbd_plugin.h
+++ b/src/sdbd_plugin.h
diff --cc src/sockets.c
index 8b7acd2,71d646d..71d646d
mode 100644,100644..100755
--- a/src/sockets.c
+++ b/src/sockets.c
diff --cc src/transport.c
index fdc8d0c,7811628..7811628
mode 100644,100644..100755
--- a/src/transport.c
+++ b/src/transport.c