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

---
 data/icons/hicolor/24x24/apps/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'data/icons/hicolor/24x24/apps/Makefile.am')

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)
-- 
cgit v1.2.1