[genlist, gen, gen_common] merge upstream except for elm_genlist.c

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

diff --git a/data/images/Makefile.am b/data/images/Makefile.am
index cb0d5d2..41838c2 100644 (file)
--- a/data/images/Makefile.am
+++ b/data/images/Makefile.am
@@ -3,6 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in
 
 filesdir = $(datadir)/elementary/images
 files_DATA = \
+insanely_huge_test_image.jpg \
 panel_01.jpg \
 plant_01.jpg \
 pol_shadow.png \
@@ -43,11 +44,15 @@ icon_20.png \
 icon_21.png \
 icon_22.png \
 icon_23.png \
+icon_right_arrow.png \
 bubble.png \
 bubble_sh.png \
-copypaste_icon_clipboard.png \
-copypaste_icon_search.png \
-copypaste_icon_share.png \
+<<<<<<< HEAD
+copy&paste_icon_clipboard.png \
+copy&paste_icon_search.png \
+copy&paste_icon_share.png \
+=======
+>>>>>>> remotes/origin/upstream
 mystrale.jpg \
 mystrale_2.jpg \
 twofish.jpg \
@@ -94,4 +99,4 @@ g_layer/long_tap_5.png \
 g_layer/tap_4.png
 
 
-EXTRA_DIST = $(files_DATA)
+EXTRA_DIST = $(files_DATA) $(files_glayer_DATA)