Merge Conflict resolved.[SegmentControl] SVN code merged. elm_label support deprecate...
authorPrince Kr Dubey <prince.dubey@samsung.com>
Tue, 17 May 2011 05:35:09 +0000 (11:05 +0530)
committerPrince Kr Dubey <prince.dubey@samsung.com>
Tue, 17 May 2011 05:35:09 +0000 (11:05 +0530)
commit680740b6ae8cc995fa02a2747a6da63aac784c7b
treeaf08c03fc59d14224c16fc116ad4b2febcd0fbd3
parent4e380a9ea96e4e7e6b76a8aa19efcfa5c277824f
Merge Conflict resolved.[SegmentControl] SVN code merged. elm_label support deprecated. Theme is also modified so merging now.

Change-Id: Ic7103cbca32bc331cbf026fdd30b17932104ce63
15 files changed:
data/objects/test.edc
data/themes/default.edc
data/themes/seg_left_pressed.png
data/themes/seg_left_selected.png
data/themes/seg_middle_normal.png
data/themes/seg_middle_pressed.png
data/themes/seg_right_normal.png
data/themes/seg_right_pressed.png
data/themes/seg_right_selected.png
data/themes/seg_single_normal.png
data/themes/seg_single_pressed.png
src/bin/test.c
src/bin/test_segment_control.c
src/lib/Elementary.h.in
src/lib/elm_segment_control.c