[Lunar-commits] CVS: moonbase/graphics/imlib2_loaders CONFLICTS, NONE, 1.1 DETAILS, 1.3, 1.4

[Chad Kittel]

Update of /var/cvs/lunar/moonbase/graphics/imlib2_loaders
In directory espresso.foo-projects.org:/tmp/cvs-serv19242/imlib2_loaders

Modified Files:
	DETAILS 
Added Files:
	CONFLICTS 
Log Message:
Conflicts with the newly added imlib2_loaders-cvs.  Also, cosmetic cleanups


--- NEW FILE: CONFLICTS ---
conflicts imlib2_loaders-cvs 

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/graphics/imlib2_loaders/DETAILS,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- DETAILS	6 Sep 2004 18:34:33 -0000	1.3
+++ DETAILS	29 Sep 2004 03:16:43 -0000	1.4
@@ -1,11 +1,11 @@
-           MODULE=imlib2_loaders
+          MODULE=imlib2_loaders
          VERSION=1.1.2
           SOURCE=$MODULE-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
-   SOURCE_URL[0]=$SFORGE_URL/enlightenment/$SOURCE
-     SOURCE_VFY=sha1:9a94640e08946ace5ce64f2cbadca422c25d0126
+      SOURCE_URL=$SFORGE_URL/enlightenment/$SOURCE
+      SOURCE_VFY=sha1:9a94640e08946ace5ce64f2cbadca422c25d0126
         WEB_SITE=http://enlightenment.org
-        MAINTAINER=nhudson at speakeasy.net
+      MAINTAINER=nhudson at speakeasy.net
          ENTERED=20011101
          UPDATED=20040906
            SHORT="imlib2_loaders contains loaders for imlib2."