SOURCES: lkmonitor-pixmaps.patch - gnome-ccperiph.png conflicts wi...

[sls]

Author: sls                          Date: Mon Mar 31 14:31:20 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- gnome-ccperiph.png conflicts with gnome-desktop

---- Files affected:
SOURCES:
   lkmonitor-pixmaps.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/lkmonitor-pixmaps.patch
diff -u SOURCES/lkmonitor-pixmaps.patch:1.2 SOURCES/lkmonitor-pixmaps.patch:1.3
--- SOURCES/lkmonitor-pixmaps.patch:1.2	Mon Mar 31 06:25:57 2008
+++ SOURCES/lkmonitor-pixmaps.patch	Mon Mar 31 16:31:14 2008
@@ -1,10 +1,12 @@
 --- lkmonitor-0.2/pixmaps/Makefile.am.orig	2008-01-21 11:47:44.000000000 +0000
 +++ lkmonitor-0.2/pixmaps/Makefile.am	2008-01-21 11:45:34.000000000 +0000
-@@ -14,7 +14,7 @@
+@@ -14,8 +14,8 @@
+ 	arana-sombra48.png\
  	button_ok.png\
  	gedit-plugin-manager.png\
- 	gnome-ccperiph.png\
+-	gnome-ccperiph.png\
 -	gnome-computer.png\
++	gnome-ccperiph-lkm.png\
 +	gnome-workstation.png\
  	gnome-cpu.png\
  	gnome-dev-battery.png\
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/lkmonitor-pixmaps.patch?r1=1.2&r2=1.3&f=u