3d, gesturelayer, index, naviframe, transit, fileselector, frame, glview, layout...

[framework/uifw/elementary.git] / src / bin / test_glview.c

diff --git a/src/bin/test_glview.c b/src/bin/test_glview.c
index 7b991d6..ecade55 100644 (file)
--- a/src/bin/test_glview.c
+++ b/src/bin/test_glview.c
@@ -341,10 +341,6 @@ static const char vertex_shader[] =
    "   gl_FragColor = color + white * dot(light_direction, rotated_normal);\n"
    "}\n";
 
-<<<<<<< HEAD
-
-=======
->>>>>>> remotes/origin/upstream
 static void
 gears_init(GLData *gld)
 {
@@ -391,10 +387,6 @@ gears_init(GLData *gld)
    gld->gear3 = make_gear(gld, 1.3, 2.0, 0.5, 10, 0.7);
 }
 
-<<<<<<< HEAD
-
-=======
->>>>>>> remotes/origin/upstream
 static void
 gldata_init(GLData *gld)
 {
@@ -448,10 +440,6 @@ _del_gl(Evas_Object *obj)
    free(gld);
 }
 
-<<<<<<< HEAD
-
-=======
->>>>>>> remotes/origin/upstream
 static void
 _resize_gl(Evas_Object *obj)
 {
@@ -465,11 +453,6 @@ _resize_gl(Evas_Object *obj)
    gears_reshape(gld, w,h);
 }
 
-<<<<<<< HEAD
-
-
-=======
->>>>>>> remotes/origin/upstream
 static void
 _draw_gl(Evas_Object *obj)
 {
@@ -494,10 +477,6 @@ _on_done(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
    evas_object_del((Evas_Object*)data);
 }
 
-<<<<<<< HEAD
-
-=======
->>>>>>> remotes/origin/upstream
 static void
 _del(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
 {
@@ -505,10 +484,6 @@ _del(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *obj, void *event
    ecore_animator_del(ani);
 }
 
-<<<<<<< HEAD
-
-=======
->>>>>>> remotes/origin/upstream
 static void
 _key_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info)
 {
@@ -579,10 +554,6 @@ _mouse_up(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *eve
    gld->mouse_down = 0;
 }
 
-<<<<<<< HEAD
-
-=======
->>>>>>> remotes/origin/upstream
 void
 test_glview(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
@@ -599,10 +570,6 @@ test_glview(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    elm_win_title_set(win, "GLView");
    elm_win_autodel_set(win, EINA_TRUE);
 
-<<<<<<< HEAD
-
-=======
->>>>>>> remotes/origin/upstream
    // add a standard bg
    bg = elm_bg_add(win);
    evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -635,10 +602,6 @@ test_glview(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_event_callback_add(gl, EVAS_CALLBACK_MOUSE_UP, _mouse_up, gl);
    evas_object_event_callback_add(gl, EVAS_CALLBACK_MOUSE_MOVE, _mouse_move, gl);
 
-<<<<<<< HEAD
-
-=======
->>>>>>> remotes/origin/upstream
    // Animator and other vars
    ani = ecore_animator_add(_anim, gl);
    gld->glapi = elm_glview_gl_api_get(gl);
@@ -646,10 +609,6 @@ test_glview(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_data_set(gl, "gld", gld);
    evas_object_event_callback_add(gl, EVAS_CALLBACK_DEL, _del, gl);
 
-<<<<<<< HEAD
-
-=======
->>>>>>> remotes/origin/upstream
    /* add an ok button */
    bt = elm_button_add(win);
    elm_object_text_set(bt, "OK");