diff options
| author | hillwood <hillwood@hillwood-opensuse.(none)> | 2013-02-19 00:07:51 +0800 |
|---|---|---|
| committer | hillwood <hillwood@hillwood-opensuse.(none)> | 2013-02-19 00:07:51 +0800 |
| commit | 30332d72c1fc31b6a71542650182faeb2237683d (patch) | |
| tree | 8964c306d3d2c03d7faf8b2635ed850fbd54f2f5 | |
| parent | c096075b4b45d0c0c688a1ba5f69037a7290847a (diff) | |
| download | caja-dropbox-30332d72c1fc31b6a71542650182faeb2237683d.tar.bz2 caja-dropbox-30332d72c1fc31b6a71542650182faeb2237683d.tar.xz | |
Fix files conflict with gnome-dropbox.
| -rwxr-xr-x | caja-dropbox.in (renamed from dropbox.in) | 0 | ||||
| -rw-r--r-- | caja-dropbox.txt.in (renamed from dropbox.txt.in) | 0 | ||||
| -rw-r--r-- | data/icons/hicolor/16x16/apps/caja-dropbox.png (renamed from data/icons/hicolor/16x16/apps/dropbox.png) | bin | 918 -> 918 bytes | |||
| -rw-r--r-- | data/icons/hicolor/22x22/apps/caja-dropbox.png (renamed from data/icons/hicolor/22x22/apps/dropbox.png) | bin | 1485 -> 1485 bytes | |||
| -rw-r--r-- | data/icons/hicolor/24x24/apps/caja-dropbox.png (renamed from data/icons/hicolor/24x24/apps/dropbox.png) | bin | 1684 -> 1684 bytes | |||
| -rw-r--r-- | data/icons/hicolor/256x256/apps/caja-dropbox.png (renamed from data/icons/hicolor/256x256/apps/dropbox.png) | bin | 17884 -> 17884 bytes | |||
| -rw-r--r-- | data/icons/hicolor/32x32/apps/caja-dropbox.png (renamed from data/icons/hicolor/32x32/apps/dropbox.png) | bin | 2157 -> 2157 bytes | |||
| -rw-r--r-- | data/icons/hicolor/48x48/apps/caja-dropbox.png (renamed from data/icons/hicolor/48x48/apps/dropbox.png) | bin | 3537 -> 3537 bytes | |||
| -rw-r--r-- | data/icons/hicolor/64x64/apps/caja-dropbox.png (renamed from data/icons/hicolor/64x64/apps/dropbox.png) | bin | 5016 -> 5016 bytes |
9 files changed, 0 insertions, 0 deletions
diff --git a/dropbox.in b/caja-dropbox.in index abf7e82..abf7e82 100755 --- a/dropbox.in +++ b/caja-dropbox.in diff --git a/dropbox.txt.in b/caja-dropbox.txt.in index 638fdc1..638fdc1 100644 --- a/dropbox.txt.in +++ b/caja-dropbox.txt.in diff --git a/data/icons/hicolor/16x16/apps/dropbox.png b/data/icons/hicolor/16x16/apps/caja-dropbox.png Binary files differindex c24af65..c24af65 100644 --- a/data/icons/hicolor/16x16/apps/dropbox.png +++ b/data/icons/hicolor/16x16/apps/caja-dropbox.png diff --git a/data/icons/hicolor/22x22/apps/dropbox.png b/data/icons/hicolor/22x22/apps/caja-dropbox.png Binary files differindex 37eb05a..37eb05a 100644 --- a/data/icons/hicolor/22x22/apps/dropbox.png +++ b/data/icons/hicolor/22x22/apps/caja-dropbox.png diff --git a/data/icons/hicolor/24x24/apps/dropbox.png b/data/icons/hicolor/24x24/apps/caja-dropbox.png Binary files differindex c4c7e45..c4c7e45 100644 --- a/data/icons/hicolor/24x24/apps/dropbox.png +++ b/data/icons/hicolor/24x24/apps/caja-dropbox.png diff --git a/data/icons/hicolor/256x256/apps/dropbox.png b/data/icons/hicolor/256x256/apps/caja-dropbox.png Binary files differindex 0fee1d4..0fee1d4 100644 --- a/data/icons/hicolor/256x256/apps/dropbox.png +++ b/data/icons/hicolor/256x256/apps/caja-dropbox.png diff --git a/data/icons/hicolor/32x32/apps/dropbox.png b/data/icons/hicolor/32x32/apps/caja-dropbox.png Binary files differindex 8e65438..8e65438 100644 --- a/data/icons/hicolor/32x32/apps/dropbox.png +++ b/data/icons/hicolor/32x32/apps/caja-dropbox.png diff --git a/data/icons/hicolor/48x48/apps/dropbox.png b/data/icons/hicolor/48x48/apps/caja-dropbox.png Binary files differindex 164119d..164119d 100644 --- a/data/icons/hicolor/48x48/apps/dropbox.png +++ b/data/icons/hicolor/48x48/apps/caja-dropbox.png diff --git a/data/icons/hicolor/64x64/apps/dropbox.png b/data/icons/hicolor/64x64/apps/caja-dropbox.png Binary files differindex 88226da..88226da 100644 --- a/data/icons/hicolor/64x64/apps/dropbox.png +++ b/data/icons/hicolor/64x64/apps/caja-dropbox.png |
