[Merge conflict resolved]
authorshilpa singh <shilpa.singh@samsung.com>
Thu, 19 Apr 2012 06:51:50 +0000 (12:21 +0530)
committershilpa singh <shilpa.singh@samsung.com>
Wed, 25 Apr 2012 05:31:24 +0000 (11:01 +0530)
commite98b346ff95093a4d6baa0b4ea447e06cdbde8c5
tree18dfc72ab452b43b786f7683c54e842115128c72
parent268e5ac9614ebd759c76b7a8ec1349af559ab74a
[Merge conflict resolved]
[Colorselector]: GUI v1.5 changes. Bug fix: calendar app: when
colorselector is added popup, colorselector goes out of popup.
Change-Id: I8234a16dae35332f320dded19032dab1936f235f
themes/inc/tizen-black-hd-inc.edc
themes/inc/tizen-black-inc.edc
themes/inc/tizen-hd-inc.edc
themes/inc/tizen-inc.edc
themes/widgets/colorselector.edc