[Xfce4-commits] <parole:master> Replace extension.png with parole-extension.png to prevent conflicts.

[Sean Davis]

Updating branch refs/heads/master
         to 50c47946d297aa7aec18c3f114f05e446ceac027 (commit)
       from e4203a6d47ae5f7fa3107b081d27a07ce36d04fc (commit)

commit 50c47946d297aa7aec18c3f114f05e446ceac027
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Tue Jan 8 12:56:59 2013 -0500

    Replace extension.png with parole-extension.png to prevent conflicts.

 data/icons/16x16/Makefile.am                       |    2 +-
 .../16x16/{extension.png => parole-extension.png}  |  Bin 754 -> 754 bytes
 data/icons/48x48/Makefile.am                       |    2 +-
 .../48x48/{extension.png => parole-extension.png}  |  Bin 2277 -> 2277 bytes
 4 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
index 2ba0547..c46d68e 100644
--- a/data/icons/16x16/Makefile.am
+++ b/data/icons/16x16/Makefile.am
@@ -5,4 +5,4 @@ Datadir = $(datadir)/icons/hicolor/16x16/apps
 
 Data_DATA =				\
 	parole.png			\
-	extension.png
+	parole-extension.png
diff --git a/data/icons/16x16/extension.png b/data/icons/16x16/parole-extension.png
similarity index 100%
rename from data/icons/16x16/extension.png
rename to data/icons/16x16/parole-extension.png
diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
index 43a0c3d..7a32d1d 100644
--- a/data/icons/48x48/Makefile.am
+++ b/data/icons/48x48/Makefile.am
@@ -5,4 +5,4 @@ Datadir = $(datadir)/icons/hicolor/48x48/apps
 
 Data_DATA =				\
 	parole.png			\
-	extension.png
+	parole-extension.png
diff --git a/data/icons/48x48/extension.png b/data/icons/48x48/parole-extension.png
similarity index 100%
rename from data/icons/48x48/extension.png
rename to data/icons/48x48/parole-extension.png