rpms/nvidia-304xx-kmod/devel nvidia-304xx-kmod.spec,1.36,1.37

Author: kwizart Update of /cvs/nonfree/rpms/nvidia-304xx-kmod/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13532 Modified Files: nvidia-304xx-kmod.spec Log Message: * Mon Mar 30 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - Rebuilt for kernel Index: nvidia-304xx-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/devel/nvidia-304xx-kmod.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- nvidia-304xx-kmod.spec 27 Mar 2015 10:11:50 -0000 1.36 +++ nvidia-304xx-kmod.spec 30 Mar 2015 13:37:05 -0000 1.37 @@ -8,7 +8,7 @@ Name: nvidia-304xx-kmod Version: 304.125 # Taken over by kmodtool -Release: 3%{?dist}.2 +Release: 3%{?dist}.3 Summary: NVIDIA display driver kernel module Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -85,9 +85,18 @@ %changelog +* Mon Mar 30 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; +- Rebuilt for kernel + +<<<<<<< nvidia-304xx-kmod.spec +* Mon Mar 30 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 304.125-3.2 +- Rebuilt for kernel + +======= * Fri Mar 27 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 304.125-3.2 - Rebuilt for kernel +>>>>>>> 1.36 * Mon Mar 23 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 304.125-3.1 - Rebuilt for kernel