diff options
| author | benpicco <[email protected]> | 2013-02-19 08:46:56 -0800 |
|---|---|---|
| committer | benpicco <[email protected]> | 2013-02-19 08:46:56 -0800 |
| commit | 204631ae053ad91bdb7149f29c5289cab4347eb3 (patch) | |
| tree | c94358f3f4710fc1af6f1b091871ee4413e66153 /data/icons/hicolor/22x22 | |
| parent | c096075b4b45d0c0c688a1ba5f69037a7290847a (diff) | |
| parent | 6740ac44bab322adf290bfdb10244d1c9a8aae55 (diff) | |
| download | caja-dropbox-204631ae053ad91bdb7149f29c5289cab4347eb3.tar.bz2 caja-dropbox-204631ae053ad91bdb7149f29c5289cab4347eb3.tar.xz | |
Merge pull request #2 from hillwoodroc/master
Fix files conflict with nautilus-dropbox
Diffstat (limited to 'data/icons/hicolor/22x22')
| -rw-r--r-- | data/icons/hicolor/22x22/apps/Makefile.am | 2 | ||||
| -rw-r--r-- | data/icons/hicolor/22x22/apps/caja-dropbox.png (renamed from data/icons/hicolor/22x22/apps/dropbox.png) | bin | 1485 -> 1485 bytes |
2 files changed, 1 insertions, 1 deletions
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/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 |
