rpms/ndiswrapper-kmod/devel ndiswrapper-kmod.spec,1.82,1.83

Author: kwizart Update of /cvs/free/rpms/ndiswrapper-kmod/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13520 Modified Files: ndiswrapper-kmod.spec Log Message: * Wed Apr 15 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.59-7.19 - Rebuilt for kernel Index: ndiswrapper-kmod.spec =================================================================== RCS file: /cvs/free/rpms/ndiswrapper-kmod/devel/ndiswrapper-kmod.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- ndiswrapper-kmod.spec 15 Apr 2015 09:26:45 -0000 1.82 +++ ndiswrapper-kmod.spec 15 Apr 2015 09:28:58 -0000 1.83 @@ -10,11 +10,7 @@ Summary: Ndiswrapper kernel module Name: ndiswrapper-kmod Version: 1.59 -<<<<<<< ndiswrapper-kmod.spec -Release: 7%{?pre}%{?dist}.18 -======= -Release: 7%{?pre}%{?dist}.15 ->>>>>>> 1.80 +Release: 7%{?pre}%{?dist}.19 License: GPLv2 Group: System Environment/Kernel URL: http://ndiswrapper.sourceforge.net @@ -81,24 +77,12 @@ %changelog -* Wed Apr 15 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; -- Rebuilt for kernel - -* Mon Mar 30 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; -- Rebuilt for kernel - -<<<<<<< ndiswrapper-kmod.spec -* Mon Mar 30 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.59-7.16 +* Wed Apr 15 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.59-7.19 - Rebuilt for kernel * Mon Mar 30 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.59-7.15 - Rebuilt for kernel -======= -* Fri Mar 27 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.59-7.15 -- Rebuilt for kernel - ->>>>>>> 1.80 * Mon Mar 23 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.59-7.14 - Rebuilt for kernel