[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 cbcf747..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 \
@@ -17,6 +18,7 @@ sky_04.jpg \
 wood_01.jpg \
 logo.png \
 logo_small.png \
+animated_logo.gif \
 parking.png \
 icon_00.png \
 icon_01.png \
@@ -42,14 +44,59 @@ 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 \
 pt.png
 
-EXTRA_DIST = $(files_DATA)
+files_glayerdir = $(datadir)/elementary/images/g_layer
+files_glayer_DATA = \
+g_layer/double_tap_1.png \
+g_layer/line_1.png \
+g_layer/momentum_1.png \
+g_layer/tap_5.png \
+g_layer/double_tap_2.png \
+g_layer/line_2.png \
+g_layer/momentum_2.png \
+g_layer/triple_tap_1.png \
+g_layer/double_tap_3.png \
+g_layer/line_3.png \
+g_layer/momentum_3.png \
+g_layer/triple_tap_2.png \
+g_layer/double_tap_4.png \
+g_layer/line_4.png \
+g_layer/momentum_4.png \
+g_layer/triple_tap_3.png \
+g_layer/double_tap_5.png \
+g_layer/line_5.png \
+g_layer/momentum_5.png \
+g_layer/triple_tap_4.png \
+g_layer/flick_1.png \
+g_layer/long_tap_1.png \
+g_layer/rotate_1.png \
+g_layer/triple_tap_5.png \
+g_layer/flick_2.png \
+g_layer/long_tap_2.png \
+g_layer/tap_1.png \
+g_layer/zoom_1.png \
+g_layer/flick_3.png \
+g_layer/long_tap_3.png \
+g_layer/tap_2.png \
+g_layer/flick_4.png \
+g_layer/long_tap_4.png \
+g_layer/tap_3.png \
+g_layer/flick_5.png \
+g_layer/long_tap_5.png \
+g_layer/tap_4.png
+
+
+EXTRA_DIST = $(files_DATA) $(files_glayer_DATA)