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)
Change-Id: Ib0a8d2b15e8946fb5cd4b9e8712ebeb78b1f88d1
Signed-off-by: Sung-jae Park <nicesj.park@samsung.com>
1  2 
src/instance.c
src/server.c
src/slave_life.c

diff --cc src/instance.c
Simple merge
diff --cc src/server.c
Simple merge
Simple merge