[Lunar-commits] CVS: moonbase/libs/i2c CONFLICTS,1.1,1.2

[Florin Braescu]

Update of /var/cvs/lunar/moonbase/libs/i2c
In directory espresso.foo-projects.org:/tmp/cvs-serv28928/libs/i2c

Modified Files:
	CONFLICTS 
Log Message:
add linux-2.6.

Index: CONFLICTS
===================================================================
RCS file: /var/cvs/lunar/moonbase/libs/i2c/CONFLICTS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CONFLICTS	20 Jul 2003 01:05:39 -0000	1.1
+++ CONFLICTS	20 Oct 2004 18:26:00 -0000	1.2
@@ -1 +1,2 @@
-conflicts linux-beta
+conflicts linux-2.6  &&
+conflicts linux-beta