projects / platform / upstream / efl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f0371f4)
elementary - removed unintended conflicted lines
authorChunEon Park <hermet@hermet.pe.kr>
Mon, 4 Nov 2013 13:19:09 +0000 (22:19 +0900)
committerChunEon Park <hermet@hermet.pe.kr>
Mon, 4 Nov 2013 13:19:09 +0000 (22:19 +0900)
that was introduced by a61bbe7dcf0c6936e3104b35d56a7ed330da4176

legacy/elementary/NEWS patch | blob | history

diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS
index 0e0d6bb..1a8b19f 100644 (file)
--- a/legacy/elementary/NEWS
+++ b/legacy/elementary/NEWS
@@ -102,7 +102,6 @@ Additions:
    * Add elm_slider_step_get(), elm_slider_step_set() for slider.
    * Add multi select mode for genlist/gengrid.
    * Add ELM_OBJECT_MULTIPLE_SELECT_MODE_WITH_CONTROL select mode for genlist/gengrid.
->>>>>>> parent of f67ecb2... popup: Added support for popup move. elm_popup_move.
 
 Improvements:
 
Domain: UI Framework / EFL;