Merge "[Merge conflict fixed] [Indentation fixed for popup, entry[only popup style...
authorShilpa Singh <shilpa.singh@samsung.com>
Tue, 19 Apr 2011 04:32:43 +0000 (13:32 +0900)
committerGerrit Code Review <git@Maetan>
Tue, 19 Apr 2011 04:32:43 +0000 (13:32 +0900)
commitb238f42df81439423653f07550ad0f213007397a
treef96f1e63a83d7a68584daecb13ea0e206a96a4f8
parent3adfcfa4e46c9ee1a42cdd6504b3cfe90ca361d5
parent37b5b5891bfbc07a31319b76e0bbbcc8efa3b751
Merge "[Merge conflict fixed] [Indentation fixed for popup, entry[only popup style]] [elm_popup]: Nbeat 1.1 implementation for popup, changes include new custom style addition in entry.edc as well."