[Merge conflict resolved]
authorShilpa Singh <shilpa.singh@samsung.com>
Fri, 30 Sep 2011 08:30:36 +0000 (17:30 +0900)
committerShilpa Singh <shilpa.singh@samsung.com>
Tue, 4 Oct 2011 02:07:40 +0000 (11:07 +0900)
commitafed105f4e6fc503530052de8c401831d6ffaa86
treefdea03417e1b7b6cd08638a576d0e233c7618a5f
parent92f7679a88a6e189217fa256efb7639c538b04b7
[Merge conflict resolved]
[elm_colorpalette]: CQs related to genlist horizontal scroll when
colorpalette is added resolved.

Change-Id: Ie0a9625e5193612852bed2bbc4fa309e740051de
themes/groups/colorpalette.edc
themes/inc/nbeat-black-inc.edc
themes/inc/nbeat-hd-inc.edc
themes/inc/nbeat-inc.edc