Merge branch 'tizen_2.4' of ssh://spin:29418/apps/widget/data-provider-master into...
authorSung-jae Park <nicesj.park@samsung.com>
Tue, 26 May 2015 12:32:08 +0000 (21:32 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Tue, 26 May 2015 12:35:11 +0000 (21:35 +0900)
Change-Id: I2fa16e9d1907f98179b0661857bd68dde0d5c67f
Signed-off-by: Sung-jae Park <nicesj.park@samsung.com>
1  2 
packaging/data-provider-master.spec
src/event.c
src/instance.c
src/notification_service.c
src/server.c
src/slave_life.c

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