summaryrefslogtreecommitdiff
path: root/data/icons
diff options
context:
space:
mode:
authorhillwood <hillwood@hillwood-opensuse.(none)>2013-02-19 00:07:51 +0800
committerhillwood <hillwood@hillwood-opensuse.(none)>2013-02-19 00:07:51 +0800
commit30332d72c1fc31b6a71542650182faeb2237683d (patch)
tree8964c306d3d2c03d7faf8b2635ed850fbd54f2f5 /data/icons
parentc096075b4b45d0c0c688a1ba5f69037a7290847a (diff)
downloadcaja-dropbox-30332d72c1fc31b6a71542650182faeb2237683d.tar.bz2
caja-dropbox-30332d72c1fc31b6a71542650182faeb2237683d.tar.xz
Fix files conflict with gnome-dropbox.
Diffstat (limited to 'data/icons')
-rw-r--r--data/icons/hicolor/16x16/apps/caja-dropbox.png (renamed from data/icons/hicolor/16x16/apps/dropbox.png)bin918 -> 918 bytes
-rw-r--r--data/icons/hicolor/22x22/apps/caja-dropbox.png (renamed from data/icons/hicolor/22x22/apps/dropbox.png)bin1485 -> 1485 bytes
-rw-r--r--data/icons/hicolor/24x24/apps/caja-dropbox.png (renamed from data/icons/hicolor/24x24/apps/dropbox.png)bin1684 -> 1684 bytes
-rw-r--r--data/icons/hicolor/256x256/apps/caja-dropbox.png (renamed from data/icons/hicolor/256x256/apps/dropbox.png)bin17884 -> 17884 bytes
-rw-r--r--data/icons/hicolor/32x32/apps/caja-dropbox.png (renamed from data/icons/hicolor/32x32/apps/dropbox.png)bin2157 -> 2157 bytes
-rw-r--r--data/icons/hicolor/48x48/apps/caja-dropbox.png (renamed from data/icons/hicolor/48x48/apps/dropbox.png)bin3537 -> 3537 bytes
-rw-r--r--data/icons/hicolor/64x64/apps/caja-dropbox.png (renamed from data/icons/hicolor/64x64/apps/dropbox.png)bin5016 -> 5016 bytes
7 files changed, 0 insertions, 0 deletions
diff --git a/data/icons/hicolor/16x16/apps/dropbox.png b/data/icons/hicolor/16x16/apps/caja-dropbox.png
index c24af65..c24af65 100644
--- a/data/icons/hicolor/16x16/apps/dropbox.png
+++ b/data/icons/hicolor/16x16/apps/caja-dropbox.png
Binary files differ
diff --git a/data/icons/hicolor/22x22/apps/dropbox.png b/data/icons/hicolor/22x22/apps/caja-dropbox.png
index 37eb05a..37eb05a 100644
--- a/data/icons/hicolor/22x22/apps/dropbox.png
+++ b/data/icons/hicolor/22x22/apps/caja-dropbox.png
Binary files differ
diff --git a/data/icons/hicolor/24x24/apps/dropbox.png b/data/icons/hicolor/24x24/apps/caja-dropbox.png
index c4c7e45..c4c7e45 100644
--- a/data/icons/hicolor/24x24/apps/dropbox.png
+++ b/data/icons/hicolor/24x24/apps/caja-dropbox.png
Binary files differ
diff --git a/data/icons/hicolor/256x256/apps/dropbox.png b/data/icons/hicolor/256x256/apps/caja-dropbox.png
index 0fee1d4..0fee1d4 100644
--- a/data/icons/hicolor/256x256/apps/dropbox.png
+++ b/data/icons/hicolor/256x256/apps/caja-dropbox.png
Binary files differ
diff --git a/data/icons/hicolor/32x32/apps/dropbox.png b/data/icons/hicolor/32x32/apps/caja-dropbox.png
index 8e65438..8e65438 100644
--- a/data/icons/hicolor/32x32/apps/dropbox.png
+++ b/data/icons/hicolor/32x32/apps/caja-dropbox.png
Binary files differ
diff --git a/data/icons/hicolor/48x48/apps/dropbox.png b/data/icons/hicolor/48x48/apps/caja-dropbox.png
index 164119d..164119d 100644
--- a/data/icons/hicolor/48x48/apps/dropbox.png
+++ b/data/icons/hicolor/48x48/apps/caja-dropbox.png
Binary files differ
diff --git a/data/icons/hicolor/64x64/apps/dropbox.png b/data/icons/hicolor/64x64/apps/caja-dropbox.png
index 88226da..88226da 100644
--- a/data/icons/hicolor/64x64/apps/dropbox.png
+++ b/data/icons/hicolor/64x64/apps/caja-dropbox.png
Binary files differ