Resolve conflicts

Change-Id: I0997872ac31f61368d4546b298e9f075e8d1a75c

diff --git a/AUTHORS b/AUTHORS
index 4b1c6fedc4cd2d462dbaa9195e6626bb28f1b72e..eefcd813315acd151e55648e6362bc48e00b99ce 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -165,7 +165,4 @@ Ji-In Moon <jiin.moon@samsung.com>
 Subodh Kumar <s7158.kumar@samsung.com>
 Kumar Navneet <k.navneet@samsung.com>
 Godly T Alias <godly.talias@samsung.com>
-<<<<<<< HEAD
-=======
 Shashank Pandey <shashank.p@samsung.com> <shashank0990@gmail.com>
->>>>>>> opensource/master

diff --git a/NEWS b/NEWS
index 36ca2049f233662cb44bcec662a2b411cf766590..3f469b944afd3324b0fc09b581e1eddc8770e963 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,18 +1,4 @@
 =================
-<<<<<<< HEAD
-Elementary 1.13.1
-=================
-
-Changes since 1.13.0:
----------------------
-
-Fixes:
-
-   * elm engine: Restore explicit use of ELM_ENGNE env var
-   * entry: Don't unlink empty files when saving @fix T2122.
-   * datetime: Fix elm_datetime_field_limit_set.
-   * genlist/gengrid: Add upadating 'focus' state in item realized function.
-=======
 Elementary 1.16.0
 =================
 
@@ -339,7 +325,6 @@ Fixes:
    * Genlist: rectification in _item_focused_next()
    * map: fix scale calculation error
    * Fix slideshow smart events event_info
->>>>>>> opensource/master
 
 Changes since 1.12.0:
 ---------------------

diff --git a/configure.ac b/configure.ac
index a91c4370df9239953a85322d8e93631c649f0d52..5168c21fe8ff972718cb8ebf20241f2ed39a13ae 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,5 @@
-<<<<<<< HEAD
-EFL_VERSION([1], [13], [1], [release])
-AC_INIT([elementary], [efl_version], [enlightenment-devel@lists.sourceforge.net])
-=======
 EFL_VERSION([1], [16], [0], [release])
 AC_INIT([elementary], [efl_version-beta3], [enlightenment-devel@lists.sourceforge.net])
->>>>>>> opensource/master
 
 AC_PREREQ(2.63)
 AC_CONFIG_SRCDIR([configure.ac])

diff --git a/data/themes/edc/elm/scroller.edc b/data/themes/edc/elm/scroller.edc
index 3c0ec82ffc12a8fa5e93817e2d97295291fb171e..34fa9103cba126fcd4ba3c3a085e775bfc1989e5 100644 (file)
--- a/data/themes/edc/elm/scroller.edc
+++ b/data/themes/edc/elm/scroller.edc
@@ -1333,8 +1333,6 @@ group { name: "elm/scroller/contents/default";
       }
    }
 }
-<<<<<<< HEAD
-=======
 
 group { name: "elm/scroller/base/popup/no_inset_shadow";
    inherit: "elm/scroller/base/default";
@@ -1357,4 +1355,3 @@ group { name: "elm/scroller/base/popup/no_inset_shadow";
       }
    }
 }
->>>>>>> opensource/master

diff --git a/src/bin/test_gengrid.c b/src/bin/test_gengrid.c
index de2b075c640959ff09175bd2f587b29a470dc3b7..523aaf330118f43f0e4d11182f7c45540e9316bb 100644 (file)
--- a/src/bin/test_gengrid.c
+++ b/src/bin/test_gengrid.c
@@ -30,10 +30,7 @@ struct _api_data
    Evas_Object *box;           /* Use this to get box content     */
    Evas_Object *grid;
    Evas_Object *grid2;
-<<<<<<< HEAD
-=======
    Elm_Gengrid_Item_Field_Type field_type;
->>>>>>> opensource/master
 };
 typedef struct _api_data api_data;
 
@@ -1986,8 +1983,6 @@ test_gengrid_focus(void *data EINA_UNUSED,
         if (i == 4)
           elm_object_item_disabled_set(id->item, EINA_TRUE);
      }
-<<<<<<< HEAD
-=======
    elm_gengrid_item_class_free(ic);
 
    evas_object_resize(win, 600, 600);
@@ -2248,7 +2243,6 @@ test_gengrid_update(void *data EINA_UNUSED,
         if (i == 4)
           elm_object_item_disabled_set(id->item, EINA_TRUE);
      }
->>>>>>> opensource/master
    elm_gengrid_item_class_free(ic);
 
    evas_object_resize(win, 600, 600);

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index ae42807a87af7c2cec3d5517eb580fbed4fcfa56..1cd7c7616060f76f369c2a0cedc543e1ceead3a3 100644 (file)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -202,10 +202,7 @@ EAPI extern Elm_Version *elm_version;
 #include <elm_clock.h>
 #include <elm_cnp.h>
 #include <elm_colorselector.h>
-<<<<<<< HEAD
-=======
 #include <elm_color_class.h>
->>>>>>> opensource/master
 #include <elm_conform.h>
 #include <elm_container.h>
 #include <elm_cursor.h>

diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 66a06bcec843784121ef184e43eacc4c84ba6701..23e3aabcc5878b07563c9bdb6818ee1dee07a05a 100644 (file)
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -5731,8 +5731,6 @@ _elm_entry_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Entry_Data
    return ret;
 }
 
-<<<<<<< HEAD
-=======
 EOLIAN static char*
 _elm_entry_elm_interface_atspi_accessible_name_get(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd)
 {
@@ -5740,5 +5738,4 @@ _elm_entry_elm_interface_atspi_accessible_name_get(Eo *obj EINA_UNUSED, Elm_Entr
    return ret ? strdup(ret) : NULL;
 }
 
->>>>>>> opensource/master
 #include "elm_entry.eo.c"

diff --git a/src/lib/elm_entry.eo b/src/lib/elm_entry.eo
index d4e7620089085f3cfec994300fb749eb3dc542a1..a58a2913d4a9f2462ff2f8657ebb754fbb02fb39 100644 (file)
--- a/src/lib/elm_entry.eo
+++ b/src/lib/elm_entry.eo
@@ -933,10 +933,7 @@ class Elm.Entry (Elm.Layout, Elm_Interface_Scrollable, Evas.Clickable_Interface,
       Elm_Interface_Scrollable.policy.set;
       Elm_Interface_Scrollable.bounce_allow.set;
       Elm_Interface_Atspi_Accessible.state_set.get;
-<<<<<<< HEAD
-=======
       Elm_Interface_Atspi_Accessible.name.get;
->>>>>>> opensource/master
       Elm_Interface_Atspi_Text.text.get;
       Elm_Interface_Atspi_Text.string.get;
       Elm_Interface_Atspi_Text.attribute.get;

diff --git a/src/lib/elm_gen_common.h b/src/lib/elm_gen_common.h
index 67e167ded264458b1b1f935d6ee5bfd851169747..c980819e241275f38b16698e5b07ceb5413a34ce 100644 (file)
--- a/src/lib/elm_gen_common.h
+++ b/src/lib/elm_gen_common.h
@@ -67,11 +67,8 @@ struct Elm_Gen_Item
    Eina_Bool                 flipped : 1; /**< a flag that shows the flip status of the item. */
    Eina_Bool                 has_contents : 1; /**< content objs have or previously did exist (size calcs) */
    Eina_Bool                 cursor_engine_only : 1;
-<<<<<<< HEAD
-=======
    Eina_Bool                 hide : 1; /**< flag used for hiding the items which do not match filter text */
    Eina_Bool                 filtered: 1; /**<flag used to indicate whether or not item has been filtered */
->>>>>>> opensource/master
 };
 
 #endif

diff --git a/src/lib/elm_interface_scrollable.eo b/src/lib/elm_interface_scrollable.eo
index f45572d9da3285ab0d50cef2a26b93d896144ef4..ed00a7aa1c18feec730a14ad062e0441f8d5a855 100644 (file)
--- a/src/lib/elm_interface_scrollable.eo
+++ b/src/lib/elm_interface_scrollable.eo
@@ -256,37 +256,7 @@ mixin Elm_Interface_Scrollable(Evas.Scrollable_Interface, Evas.Object_Smart)
             loop_v: bool; [[The scrolling vertical loop]]
          }
       }
-<<<<<<< HEAD
-      loop {
-         set {
-            /*@ Sets an infinite loop for a scroller.
-
-             This sets an infinite loop for a scroller.
-
-             @since 1.14
-
-             @ingroup Widget
-             */
-         }
-         get {
-            /*@ Gets an infinite loop for a scroller.
-
-             This gets an infinite loop for a scroller.
-
-             @since 1.14
-
-             @ingroup Widget
-             */
-         }
-         values {
-            Eina_Bool loop_h; /*@ The scrolling horizontal loop */
-            Eina_Bool loop_v; /*@ The scrolling vertical loop */
-         }
-      }
-      scroll_up_cb {
-=======
       @property scroll_up_cb {
->>>>>>> opensource/master
          set {
             [[Set the callback to run when the content has been moved up.]]
          }

diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c
index 9d96d038144e282a3aa2b4554812f792576e229a..f722b3209399284c1e15606e019145277df999b1 100644 (file)
--- a/src/lib/elm_scroller.c
+++ b/src/lib/elm_scroller.c
@@ -113,11 +113,8 @@ _key_action_move(Evas_Object *obj, const char *params)
          elm_interface_scrollable_content_viewport_geometry_get
          (&v_x, &v_y, &v_w, &v_h));
    evas_object_geometry_get(sd->content, &c_x, &c_y, &max_x, &max_y);
-<<<<<<< HEAD
-=======
 
    _elm_widget_focus_auto_show(obj);
->>>>>>> opensource/master
 
    current_focus = elm_widget_focused_object_get(obj);
    evas_object_geometry_get(current_focus, &f_x, &f_y, &f_w, &f_h);
@@ -150,10 +147,7 @@ _key_action_move(Evas_Object *obj, const char *params)
                   if (cur_weight == 0.0)
                     {
                        elm_widget_focus_steal(cur, NULL);
-<<<<<<< HEAD
-=======
                        eina_list_free(can_focus_list);
->>>>>>> opensource/master
                        return EINA_TRUE;
                     }
                   cur_weight = 1.0 / cur_weight;
@@ -167,10 +161,7 @@ _key_action_move(Evas_Object *obj, const char *params)
         if (new_focus)
           {
              elm_widget_focus_steal(new_focus, NULL);
-<<<<<<< HEAD
-=======
              eina_list_free(can_focus_list);
->>>>>>> opensource/master
              return EINA_TRUE;
           }
      }
@@ -190,10 +181,7 @@ _key_action_move(Evas_Object *obj, const char *params)
         if (r && new_focus)
           {
              elm_widget_focus_steal(new_focus, new_focus_item);
-<<<<<<< HEAD
-=======
              eina_list_free(can_focus_list);
->>>>>>> opensource/master
              return EINA_TRUE;
           }
      }
@@ -1428,8 +1416,6 @@ elm_scroller_loop_get(const Evas_Object *obj,
    eo_do(obj, elm_interface_scrollable_loop_get(loop_h, loop_v));
 }
 
-<<<<<<< HEAD
-=======
 EAPI void
 elm_scroller_wheel_disabled_set(Evas_Object *obj, Eina_Bool disabled)
 {
@@ -1448,7 +1434,6 @@ elm_scroller_wheel_disabled_get(const Evas_Object *obj)
    return eo_do_ret((Eo *) obj, ret, elm_interface_scrollable_wheel_disabled_get());
 }
 
->>>>>>> opensource/master
 EOLIAN static void
 _elm_scroller_propagate_events_set(Eo *obj, Elm_Scroller_Data *_pd EINA_UNUSED, Eina_Bool propagation)
 {

diff --git a/src/lib/elm_toolbar.eo b/src/lib/elm_toolbar.eo
index 7ad7ec65abdce6436dbf0ee39ccb910291a25d82..25e6034bca70d3baaad42f90a9d02a31764f4971 100644 (file)
--- a/src/lib/elm_toolbar.eo
+++ b/src/lib/elm_toolbar.eo
@@ -377,8 +377,6 @@ class Elm.Toolbar (Elm.Widget, Elm_Interface_Scrollable,
       Elm_Interface_Atspi_Widget_Action.elm_actions.get;
       Elm_Interface_Atspi_Accessible.children.get;
       Elm_Interface_Atspi_Accessible.state_set.get;
-<<<<<<< HEAD
-=======
       Elm_Interface_Atspi_Selection.selected_children_count.get;
       Elm_Interface_Atspi_Selection.selected_child.get;
       Elm_Interface_Atspi_Selection.selected_child_deselect;
@@ -387,7 +385,6 @@ class Elm.Toolbar (Elm.Widget, Elm_Interface_Scrollable,
       Elm_Interface_Atspi_Selection.is_child_selected;
       Elm_Interface_Atspi_Selection.all_children_select;
       Elm_Interface_Atspi_Selection.clear;
->>>>>>> opensource/master
    }
    events {
       language,changed;

diff --git a/src/lib/elm_transit.c b/src/lib/elm_transit.c
index 596242d652e46ed49922e14142bc6234bee3cc20..ade93909007746c83ed534b314698592c8e98108 100644 (file)
--- a/src/lib/elm_transit.c
+++ b/src/lib/elm_transit.c
@@ -30,11 +30,7 @@ struct _Elm_Transit
    EINA_MAGIC;
 
    Ecore_Animator *animator;
-<<<<<<< HEAD
-   Ecore_Timer *timer;
-=======
    Ecore_Timer *go_in_timer; /**< Timer used by elm_transit_go_in() */
->>>>>>> opensource/master
    Eina_Inlist *effect_list;
    Eina_List *objs;
    Elm_Transit *prev_chain_transit;
@@ -276,11 +272,7 @@ _transit_del(Elm_Transit *transit)
    if (transit->del_data.func)
      transit->del_data.func(transit->del_data.arg, transit);
 
-<<<<<<< HEAD
-   ecore_timer_del(transit->timer);
-=======
    ecore_timer_del(transit->go_in_timer);
->>>>>>> opensource/master
 
    //cut off the chain transit relationship
    EINA_LIST_FOREACH_SAFE(transit->next_chain_transits, elist, elist_next, chain_transit)
@@ -477,19 +469,11 @@ _recover_image_uv(Evas_Object *obj, Evas_Map *map, Eina_Bool revert, Eina_Bool b
 }
 
 static Eina_Bool
-<<<<<<< HEAD
-_transit_go_in_cb(void *data)
-{
-   Elm_Transit *transit = data;
-
-   transit->timer = NULL;
-=======
 _go_in_timer_cb(void *data)
 {
    Elm_Transit *transit = data;
 
    transit->go_in_timer = NULL;
->>>>>>> opensource/master
    elm_transit_go(transit);
 
    return ECORE_CALLBACK_CANCEL;
@@ -759,11 +743,7 @@ elm_transit_go(Elm_Transit *transit)
 {
    ELM_TRANSIT_CHECK_OR_RETURN(transit);
 
-<<<<<<< HEAD
-   ELM_SAFE_FREE(transit->timer, ecore_timer_del);
-=======
    ELM_SAFE_FREE(transit->go_in_timer, ecore_timer_del);
->>>>>>> opensource/master
 
    Eina_List *elist;
    Evas_Object *obj;
@@ -792,13 +772,8 @@ elm_transit_go_in(Elm_Transit *transit, double in)
 {
    ELM_TRANSIT_CHECK_OR_RETURN(transit);
 
-<<<<<<< HEAD
-   if (transit->timer) ecore_timer_del(transit->timer);
-   transit->timer = ecore_timer_add(in, _transit_go_in_cb, transit);
-=======
    ecore_timer_del(transit->go_in_timer);
    transit->go_in_timer = ecore_timer_add(in, _go_in_timer_cb, transit);
->>>>>>> opensource/master
 }
 
 EAPI void

diff --git a/src/lib/elm_transit.h b/src/lib/elm_transit.h
index 7d6da70d2cd8fe3678273c0eeb0ea0862e7c8886..90938d5ffe1a9ce740094da4126773045b3e16a6 100644 (file)
--- a/src/lib/elm_transit.h
+++ b/src/lib/elm_transit.h
@@ -589,11 +589,7 @@ EAPI void                   elm_transit_go(Elm_Transit *transit);
  * @since 1.14
  * @ingroup Transit
  */
-<<<<<<< HEAD
-EAPI void elm_transit_go_in(Elm_Transit *transit, double in);
-=======
 EAPI void                   elm_transit_go_in(Elm_Transit *transit, double in);
->>>>>>> opensource/master
 
 /**
  * Pause/Resume the transition.