erge conflict resolve.[SegmentControl] elm_label support deprecated. Color Macro...
authorPrince Kr Dubey <prince.dubey@samsung.com>
Thu, 28 Apr 2011 09:05:04 +0000 (14:35 +0530)
committerPrince Kr Dubey <prince.dubey@samsung.com>
Tue, 17 May 2011 05:37:30 +0000 (11:07 +0530)
commitef2ec902da1083c60d4db550a7371bd0aec1c47f
tree9c0674fb36ca35c2da1878e9feae747df678bc38
parentd4c7dee0cb124598620a8cc66b9acb824bdb39ef
erge conflict resolve.[SegmentControl] elm_label support deprecated. Color Macro added.

Change-Id: Iacb6f58b73cc575b4ebbae04348bd36c51d66f4e
themes/groups/segmentedcontrol.edc
themes/inc/nbeat-black-inc.edc
themes/inc/nbeat-inc.edc