[Xfce4-commits] <ristretto:master> Remove conflicting icons

[Stephan Arts]

Updating branch refs/heads/master
         to c2666bf6505eb267146ca32075e9ff9a3a7b13a9 (commit)
       from a94651544211a7f111d3e9a9e7bb412115c1c1fd (commit)

commit c2666bf6505eb267146ca32075e9ff9a3a7b13a9
Author: Stephan Arts <stephan at xfce.org>
Date:   Wed Apr 4 04:06:05 2012 +0200

    Remove conflicting icons

 icons/22x22/Makefile.am   |    9 ---------
 icons/22x22/ristretto.png |  Bin 1238 -> 0 bytes
 icons/24x24/Makefile.am   |    9 ---------
 icons/24x24/ristretto.png |  Bin 1378 -> 0 bytes
 icons/32x32/Makefile.am   |    9 ---------
 icons/32x32/ristretto.png |  Bin 2000 -> 0 bytes
 icons/36x36/Makefile.am   |    9 ---------
 icons/36x36/ristretto.png |  Bin 2404 -> 0 bytes
 8 files changed, 0 insertions(+), 36 deletions(-)

diff --git a/icons/22x22/Makefile.am b/icons/22x22/Makefile.am
deleted file mode 100644
index 89532a3..0000000
--- a/icons/22x22/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-
-# Inspired by Makefile.am from the Thunar file-manager
-
-iconsdir = $(datadir)/icons/hicolor/22x22/apps
-icons_DATA = ristretto.png
-	
-
-EXTRA_DIST = $(icons_DATA)
-
diff --git a/icons/22x22/ristretto.png b/icons/22x22/ristretto.png
deleted file mode 100644
index f4f87b0..0000000
Binary files a/icons/22x22/ristretto.png and /dev/null differ
diff --git a/icons/24x24/Makefile.am b/icons/24x24/Makefile.am
deleted file mode 100644
index 8d1a4ec..0000000
--- a/icons/24x24/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-
-# Inspired by Makefile.am from the Thunar file-manager
-
-iconsdir = $(datadir)/icons/hicolor/24x24/apps
-icons_DATA = ristretto.png
-	
-
-EXTRA_DIST = $(icons_DATA)
-
diff --git a/icons/24x24/ristretto.png b/icons/24x24/ristretto.png
deleted file mode 100644
index a32926d..0000000
Binary files a/icons/24x24/ristretto.png and /dev/null differ
diff --git a/icons/32x32/Makefile.am b/icons/32x32/Makefile.am
deleted file mode 100644
index 900634b..0000000
--- a/icons/32x32/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-
-# Inspired by Makefile.am from the Thunar file-manager
-
-iconsdir = $(datadir)/icons/hicolor/32x32/apps
-icons_DATA = ristretto.png
-	
-
-EXTRA_DIST = $(icons_DATA)
-
diff --git a/icons/32x32/ristretto.png b/icons/32x32/ristretto.png
deleted file mode 100644
index e88dcd2..0000000
Binary files a/icons/32x32/ristretto.png and /dev/null differ
diff --git a/icons/36x36/Makefile.am b/icons/36x36/Makefile.am
deleted file mode 100644
index e34aa3e..0000000
--- a/icons/36x36/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-
-# Inspired by Makefile.am from the Thunar file-manager
-
-iconsdir = $(datadir)/icons/hicolor/36x36/apps
-icons_DATA = ristretto.png
-	
-
-EXTRA_DIST = $(icons_DATA)
-
diff --git a/icons/36x36/ristretto.png b/icons/36x36/ristretto.png
deleted file mode 100644
index 5fd2d0c..0000000
Binary files a/icons/36x36/ristretto.png and /dev/null differ