Merge branch 'tizen_3.0' into tizen 35/108335/1 accepted/tizen/common/20170104.073233 accepted/tizen/ivi/20170104.221837 accepted/tizen/mobile/20170104.221743 accepted/tizen/tv/20170104.221802 accepted/tizen/unified/20170309.040846 accepted/tizen/wearable/20170104.221819 submit/tizen/20170104.060414 submit/tizen_unified/20170308.100420
authorSangJin Kim <sangjin3.kim@samsung.com>
Wed, 4 Jan 2017 05:42:59 +0000 (14:42 +0900)
committerSangJin Kim <sangjin3.kim@samsung.com>
Wed, 4 Jan 2017 05:42:59 +0000 (14:42 +0900)
commit09b79aaeff0ee445aa47404d8dc9d4990fad0ab4
tree13c149eb75e695f2b2f12f29856edb75cb89180f
parent5b1a2dc2fe25c692139011c5d427f9728c847994
parentb3894c7aa4e819c5cde88c7d389fb8300af6fdb1
Merge branch 'tizen_3.0' into tizen

Change-Id: I700aec60ab37b0f533572483b0048d60fb1622bb
Signed-off-by: SangJin Kim <sangjin3.kim@samsung.com>
CMakeLists.txt
src/sdb.c
src/sdb.h
src/sdbd_plugin.h
src/sockets.c
src/transport.c