Merge branch 'tizen_2.3' of ssh://spin:29418/apps/widget/data-provider-slave into... submit/tizen_mobile/20150515.034358
authorSung-jae Park <nicesj.park@samsung.com>
Fri, 15 May 2015 03:36:34 +0000 (12:36 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Fri, 15 May 2015 03:36:34 +0000 (12:36 +0900)
1  2 
src/client.c
src/widget.c

diff --cc src/client.c
Simple merge
diff --cc src/widget.c
Simple merge