rpms/xorg-x11-drv-nvidia/devel xorg-x11-drv-nvidia.spec,1.143,1.144

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20944

Modified Files:
	xorg-x11-drv-nvidia.spec 
Log Message:
Add conflicts for 340xx



Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- xorg-x11-drv-nvidia.spec	16 Aug 2014 14:09:57 -0000	1.143
+++ xorg-x11-drv-nvidia.spec	16 Aug 2014 14:10:37 -0000	1.144
@@ -52,6 +52,7 @@
 Conflicts:       xorg-x11-drv-nvidia-96xx
 Conflicts:       xorg-x11-drv-nvidia-173xx
 Conflicts:       xorg-x11-drv-nvidia-304xx
+Conflicts:       xorg-x11-drv-nvidia-340xx
 Conflicts:       xorg-x11-drv-fglrx
 Conflicts:       xorg-x11-drv-catalyst