From: shilpa onkar singh Date: Mon, 21 Feb 2011 04:51:33 +0000 (+0900) Subject: Merge "[Merge Conflict Resolved: elm_popup.c] [elm_popup]: const keyword added to... X-Git-Tag: REL_I9200_20110603-1~335 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=08529e6827ce13b5ad3757f691cd6a5243a7661a;p=framework%2Fuifw%2Felementary.git Merge "[Merge Conflict Resolved: elm_popup.c] [elm_popup]: const keyword added to char * parameters according to EFL standards in APIs elm_popup_buttons_add and elm_popup_with_buttons_add" --- 08529e6827ce13b5ad3757f691cd6a5243a7661a