rpms/xorg-x11-drv-nv/devel xorg-x11-drv-nv.spec,1.78,1.79

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-nv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21180

Modified Files:
	xorg-x11-drv-nv.spec 
Log Message:
* Wed Oct 22 2008 Adam Jackson <ajax at redhat.com> 2.1.12-6
- nv-2.1.8-g80-no-doublescan.patch: Disable doublescan on G80, too many
  monitors get confused.



Index: xorg-x11-drv-nv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/xorg-x11-drv-nv.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- xorg-x11-drv-nv.spec	22 Oct 2008 17:29:30 -0000	1.78
+++ xorg-x11-drv-nv.spec	22 Oct 2008 17:30:57 -0000	1.79
@@ -30,11 +30,7 @@
 Patch5:	    nv-2.1.6-starvation.patch
 Patch6:	    nv-2.1.6-panel-fix.patch
 Patch7:	    nv-save-rom.patch
-<<<<<<< xorg-x11-drv-nv.spec
-Patch8:	    nv-2.1.12-fb-size.patch
 Patch9:	    nv-2.1.8-g80-no-doublescan.patch
-=======
->>>>>>> 1.77
 
 %description 
 X.Org X11 nv video driver.
@@ -47,11 +43,7 @@
 %patch5 -p1 -b .starve
 %patch6 -p1 -b .panel
 %patch7 -p1 -b .save-rom
-<<<<<<< xorg-x11-drv-nv.spec
-%patch8 -p1 -b .fb-size
 %patch9 -p1 -b .doublescan
-=======
->>>>>>> 1.77
 
 %build
 %configure --disable-static