summaryrefslogtreecommitdiff
path: root/data/icons
diff options
context:
space:
mode:
authorhillwood <hillwood@hillwood-opensuse.(none)>2013-02-19 00:18:25 +0800
committerhillwood <hillwood@hillwood-opensuse.(none)>2013-02-19 00:18:25 +0800
commit0f59e97468dae7ddf1a389281d488e6972c273c9 (patch)
treef03f1303d99163ae83d4c0821f5a7c4077667d2d /data/icons
parent30332d72c1fc31b6a71542650182faeb2237683d (diff)
downloadcaja-dropbox-0f59e97468dae7ddf1a389281d488e6972c273c9.tar.bz2
caja-dropbox-0f59e97468dae7ddf1a389281d488e6972c273c9.tar.xz
Fix files conflict with gnome-dropbox.
Diffstat (limited to 'data/icons')
-rw-r--r--data/icons/hicolor/16x16/apps/Makefile.am2
-rw-r--r--data/icons/hicolor/22x22/apps/Makefile.am2
-rw-r--r--data/icons/hicolor/24x24/apps/Makefile.am2
-rw-r--r--data/icons/hicolor/256x256/apps/Makefile.am2
-rw-r--r--data/icons/hicolor/32x32/apps/Makefile.am2
-rw-r--r--data/icons/hicolor/48x48/apps/Makefile.am2
-rw-r--r--data/icons/hicolor/64x64/apps/Makefile.am2
7 files changed, 7 insertions, 7 deletions
diff --git a/data/icons/hicolor/16x16/apps/Makefile.am b/data/icons/hicolor/16x16/apps/Makefile.am
index 1412ea3..b2ec0da 100644
--- a/data/icons/hicolor/16x16/apps/Makefile.am
+++ b/data/icons/hicolor/16x16/apps/Makefile.am
@@ -4,6 +4,6 @@ context = apps
iconsdir = $(themedir)/$(size)/$(context)
-icons_DATA = dropbox.png
+icons_DATA = caja-dropbox.png
EXTRA_DIST = $(icons_DATA)
diff --git a/data/icons/hicolor/22x22/apps/Makefile.am b/data/icons/hicolor/22x22/apps/Makefile.am
index 161ccc5..e6a228f 100644
--- a/data/icons/hicolor/22x22/apps/Makefile.am
+++ b/data/icons/hicolor/22x22/apps/Makefile.am
@@ -4,6 +4,6 @@ context = apps
iconsdir = $(themedir)/$(size)/$(context)
-icons_DATA = dropbox.png
+icons_DATA = caja-dropbox.png
EXTRA_DIST = $(icons_DATA)
diff --git a/data/icons/hicolor/24x24/apps/Makefile.am b/data/icons/hicolor/24x24/apps/Makefile.am
index 6dc45f5..d782f02 100644
--- a/data/icons/hicolor/24x24/apps/Makefile.am
+++ b/data/icons/hicolor/24x24/apps/Makefile.am
@@ -4,6 +4,6 @@ context = apps
iconsdir = $(themedir)/$(size)/$(context)
-icons_DATA = dropbox.png
+icons_DATA = caja-dropbox.png
EXTRA_DIST = $(icons_DATA)
diff --git a/data/icons/hicolor/256x256/apps/Makefile.am b/data/icons/hicolor/256x256/apps/Makefile.am
index ae589f9..4f4c6f3 100644
--- a/data/icons/hicolor/256x256/apps/Makefile.am
+++ b/data/icons/hicolor/256x256/apps/Makefile.am
@@ -4,6 +4,6 @@ context = apps
iconsdir = $(themedir)/$(size)/$(context)
-icons_DATA = dropbox.png
+icons_DATA = caja-dropbox.png
EXTRA_DIST = $(icons_DATA)
diff --git a/data/icons/hicolor/32x32/apps/Makefile.am b/data/icons/hicolor/32x32/apps/Makefile.am
index ab29e83..30e0537 100644
--- a/data/icons/hicolor/32x32/apps/Makefile.am
+++ b/data/icons/hicolor/32x32/apps/Makefile.am
@@ -4,6 +4,6 @@ context = apps
iconsdir = $(themedir)/$(size)/$(context)
-icons_DATA = dropbox.png
+icons_DATA = caja-dropbox.png
EXTRA_DIST = $(icons_DATA)
diff --git a/data/icons/hicolor/48x48/apps/Makefile.am b/data/icons/hicolor/48x48/apps/Makefile.am
index 9b99f8e..0348cbe 100644
--- a/data/icons/hicolor/48x48/apps/Makefile.am
+++ b/data/icons/hicolor/48x48/apps/Makefile.am
@@ -4,6 +4,6 @@ context = apps
iconsdir = $(themedir)/$(size)/$(context)
-icons_DATA = dropbox.png
+icons_DATA = caja-dropbox.png
EXTRA_DIST = $(icons_DATA)
diff --git a/data/icons/hicolor/64x64/apps/Makefile.am b/data/icons/hicolor/64x64/apps/Makefile.am
index eba2531..dc95b97 100644
--- a/data/icons/hicolor/64x64/apps/Makefile.am
+++ b/data/icons/hicolor/64x64/apps/Makefile.am
@@ -4,6 +4,6 @@ context = apps
iconsdir = $(themedir)/$(size)/$(context)
-icons_DATA = dropbox.png
+icons_DATA = caja-dropbox.png
EXTRA_DIST = $(icons_DATA)