Merge remote-tracking branch 'remotes/origin/upstream'

[framework/uifw/elementary.git] / data / themes / Makefile.am

diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index bfc848d..6ae281f 100644 (file)
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -29,7 +29,10 @@ widgets/notify.edc \
 widgets/slider.edc \
 widgets/button.edc \
 widgets/gengrid.edc \
+<<<<<<< HEAD
 widgets/pager.edc \
+=======
+>>>>>>> remotes/origin/upstream
 widgets/slideshow.edc \
 widgets/calendar.edc \
 widgets/genlist.edc \
@@ -62,6 +65,13 @@ widgets/win.edc \
 widgets/entry.edc \
 widgets/map.edc \
 widgets/scroller.edc \
+<<<<<<< HEAD
+=======
+widgets/pointer.edc \
+widgets/datetime.edc \
+widgets/dayselector.edc \
+widgets/popup.edc \
+>>>>>>> remotes/origin/upstream
 ews.edc \
 arrow_down.png \
 arrow_up.png \
@@ -313,7 +323,25 @@ mp_play.png \
 mp_prev.png \
 mp_rewind.png \
 mp_stop.png \
+<<<<<<< HEAD
 access_glow.png
+=======
+access_glow.png \
+pointer_glint_01.png \
+pointer_glint_02.png \
+pointer_glint_03.png \
+pointer_glint_04.png \
+pointer_glint_05.png \
+pointer_glint_06.png \
+pointer_glint_07.png \
+pointer_glint_08.png \
+pointer_glint_09.png \
+pointer_glint_10.png \
+pointer_glint_11.png \
+pointer_glint_12.png \
+pointer_glow.png \
+pointer.png
+>>>>>>> remotes/origin/upstream
 
 default.edj: Makefile $(EXTRA_DIST)
        $(EDJE_CC) $(EDJE_FLAGS) \