Merge branch 'tizen_2.3' of ssh://spin:29418/apps/widget/data-provider-master into...
authorSung-jae Park <nicesj.park@samsung.com>
Fri, 15 May 2015 03:37:33 +0000 (12:37 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Fri, 15 May 2015 03:37:38 +0000 (12:37 +0900)
commit4846db5a7c9b15ad20931b96c9bb653b0334b83e
tree78cddaf61f8ba163c514cf7806ba731cfe8b0570
parent35fc715b04a887eccef6d821c14d1e7d1895961d
parent0a78696ef4a59450289f3092b5312250fcaf2f9a
Merge branch 'tizen_2.3' of ssh://spin:29418/apps/widget/data-provider-master into tizen

Change-Id: Ib0a8d2b15e8946fb5cd4b9e8712ebeb78b1f88d1
Signed-off-by: Sung-jae Park <nicesj.park@samsung.com>
src/instance.c
src/server.c
src/slave_life.c