Merge branch 'intefl/surc'
authorJung Chanwook <joey.jung@samsung.com>
Tue, 24 Jul 2012 06:10:52 +0000 (15:10 +0900)
committerJung Chanwook <joey.jung@samsung.com>
Tue, 24 Jul 2012 06:10:52 +0000 (15:10 +0900)
commit6d478f842a574508abb2879ca1464c6fc4bca757
tree4f23ed7d9cc77d76e2250f47c9343037f99d71d9
parent91be11f4dc16f740f85c5008bb835d5dde64aa8b
parent75c68b827549b5b9a5ccc8afdfb95c3b87bd4310
Merge branch 'intefl/surc'

Conflicts:
themes/images/tizen-hd/00_winset_title_tabbar_bg.png
themes/inc/tizen-hd-inc.edc
themes/widgets/button.edc
themes/widgets/multibuttonentry.edc

Change-Id: I7396ff0a07189cc43f825147cba332c8d2a6a8c9
themes/inc/tizen-hd-inc.edc
themes/widgets/button.edc
themes/widgets/ctxpopup.edc
themes/widgets/genlist/genlist_macro.edc
themes/widgets/genlist/genlist_normal.edc
themes/widgets/popup.edc
themes/widgets/toolbar.edc