From 30332d72c1fc31b6a71542650182faeb2237683d Mon Sep 17 00:00:00 2001
From: hillwood <hillwood@hillwood-opensuse.(none)>
Date: Tue, 19 Feb 2013 00:07:51 +0800
Subject: Fix files conflict with gnome-dropbox.

---
 data/icons/hicolor/16x16/apps/caja-dropbox.png   | Bin 0 -> 918 bytes
 data/icons/hicolor/16x16/apps/dropbox.png        | Bin 918 -> 0 bytes
 data/icons/hicolor/22x22/apps/caja-dropbox.png   | Bin 0 -> 1485 bytes
 data/icons/hicolor/22x22/apps/dropbox.png        | Bin 1485 -> 0 bytes
 data/icons/hicolor/24x24/apps/caja-dropbox.png   | Bin 0 -> 1684 bytes
 data/icons/hicolor/24x24/apps/dropbox.png        | Bin 1684 -> 0 bytes
 data/icons/hicolor/256x256/apps/caja-dropbox.png | Bin 0 -> 17884 bytes
 data/icons/hicolor/256x256/apps/dropbox.png      | Bin 17884 -> 0 bytes
 data/icons/hicolor/32x32/apps/caja-dropbox.png   | Bin 0 -> 2157 bytes
 data/icons/hicolor/32x32/apps/dropbox.png        | Bin 2157 -> 0 bytes
 data/icons/hicolor/48x48/apps/caja-dropbox.png   | Bin 0 -> 3537 bytes
 data/icons/hicolor/48x48/apps/dropbox.png        | Bin 3537 -> 0 bytes
 data/icons/hicolor/64x64/apps/caja-dropbox.png   | Bin 0 -> 5016 bytes
 data/icons/hicolor/64x64/apps/dropbox.png        | Bin 5016 -> 0 bytes
 14 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 data/icons/hicolor/16x16/apps/caja-dropbox.png
 delete mode 100644 data/icons/hicolor/16x16/apps/dropbox.png
 create mode 100644 data/icons/hicolor/22x22/apps/caja-dropbox.png
 delete mode 100644 data/icons/hicolor/22x22/apps/dropbox.png
 create mode 100644 data/icons/hicolor/24x24/apps/caja-dropbox.png
 delete mode 100644 data/icons/hicolor/24x24/apps/dropbox.png
 create mode 100644 data/icons/hicolor/256x256/apps/caja-dropbox.png
 delete mode 100644 data/icons/hicolor/256x256/apps/dropbox.png
 create mode 100644 data/icons/hicolor/32x32/apps/caja-dropbox.png
 delete mode 100644 data/icons/hicolor/32x32/apps/dropbox.png
 create mode 100644 data/icons/hicolor/48x48/apps/caja-dropbox.png
 delete mode 100644 data/icons/hicolor/48x48/apps/dropbox.png
 create mode 100644 data/icons/hicolor/64x64/apps/caja-dropbox.png
 delete mode 100644 data/icons/hicolor/64x64/apps/dropbox.png

(limited to 'data/icons/hicolor')

diff --git a/data/icons/hicolor/16x16/apps/caja-dropbox.png b/data/icons/hicolor/16x16/apps/caja-dropbox.png
new file mode 100644
index 0000000..c24af65
Binary files /dev/null and b/data/icons/hicolor/16x16/apps/caja-dropbox.png differ
diff --git a/data/icons/hicolor/16x16/apps/dropbox.png b/data/icons/hicolor/16x16/apps/dropbox.png
deleted file mode 100644
index c24af65..0000000
Binary files a/data/icons/hicolor/16x16/apps/dropbox.png and /dev/null differ
diff --git a/data/icons/hicolor/22x22/apps/caja-dropbox.png b/data/icons/hicolor/22x22/apps/caja-dropbox.png
new file mode 100644
index 0000000..37eb05a
Binary files /dev/null and b/data/icons/hicolor/22x22/apps/caja-dropbox.png differ
diff --git a/data/icons/hicolor/22x22/apps/dropbox.png b/data/icons/hicolor/22x22/apps/dropbox.png
deleted file mode 100644
index 37eb05a..0000000
Binary files a/data/icons/hicolor/22x22/apps/dropbox.png and /dev/null differ
diff --git a/data/icons/hicolor/24x24/apps/caja-dropbox.png b/data/icons/hicolor/24x24/apps/caja-dropbox.png
new file mode 100644
index 0000000..c4c7e45
Binary files /dev/null and b/data/icons/hicolor/24x24/apps/caja-dropbox.png differ
diff --git a/data/icons/hicolor/24x24/apps/dropbox.png b/data/icons/hicolor/24x24/apps/dropbox.png
deleted file mode 100644
index c4c7e45..0000000
Binary files a/data/icons/hicolor/24x24/apps/dropbox.png and /dev/null differ
diff --git a/data/icons/hicolor/256x256/apps/caja-dropbox.png b/data/icons/hicolor/256x256/apps/caja-dropbox.png
new file mode 100644
index 0000000..0fee1d4
Binary files /dev/null and b/data/icons/hicolor/256x256/apps/caja-dropbox.png differ
diff --git a/data/icons/hicolor/256x256/apps/dropbox.png b/data/icons/hicolor/256x256/apps/dropbox.png
deleted file mode 100644
index 0fee1d4..0000000
Binary files a/data/icons/hicolor/256x256/apps/dropbox.png and /dev/null differ
diff --git a/data/icons/hicolor/32x32/apps/caja-dropbox.png b/data/icons/hicolor/32x32/apps/caja-dropbox.png
new file mode 100644
index 0000000..8e65438
Binary files /dev/null and b/data/icons/hicolor/32x32/apps/caja-dropbox.png differ
diff --git a/data/icons/hicolor/32x32/apps/dropbox.png b/data/icons/hicolor/32x32/apps/dropbox.png
deleted file mode 100644
index 8e65438..0000000
Binary files a/data/icons/hicolor/32x32/apps/dropbox.png and /dev/null differ
diff --git a/data/icons/hicolor/48x48/apps/caja-dropbox.png b/data/icons/hicolor/48x48/apps/caja-dropbox.png
new file mode 100644
index 0000000..164119d
Binary files /dev/null and b/data/icons/hicolor/48x48/apps/caja-dropbox.png differ
diff --git a/data/icons/hicolor/48x48/apps/dropbox.png b/data/icons/hicolor/48x48/apps/dropbox.png
deleted file mode 100644
index 164119d..0000000
Binary files a/data/icons/hicolor/48x48/apps/dropbox.png and /dev/null differ
diff --git a/data/icons/hicolor/64x64/apps/caja-dropbox.png b/data/icons/hicolor/64x64/apps/caja-dropbox.png
new file mode 100644
index 0000000..88226da
Binary files /dev/null and b/data/icons/hicolor/64x64/apps/caja-dropbox.png differ
diff --git a/data/icons/hicolor/64x64/apps/dropbox.png b/data/icons/hicolor/64x64/apps/dropbox.png
deleted file mode 100644
index 88226da..0000000
Binary files a/data/icons/hicolor/64x64/apps/dropbox.png and /dev/null differ
-- 
cgit v1.2.1