rpms/ndiswrapper-kmod/devel ndiswrapper-kmod.spec,1.80,1.81

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/ndiswrapper-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13077

Modified Files:
	ndiswrapper-kmod.spec 
Log Message:
* Mon Mar 30 2015 Nicolas Chauvet <kwizart at gmail.com>
- Rebuilt for kernel



Index: ndiswrapper-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/devel/ndiswrapper-kmod.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- ndiswrapper-kmod.spec	27 Mar 2015 10:11:24 -0000	1.80
+++ ndiswrapper-kmod.spec	30 Mar 2015 13:36:40 -0000	1.81
@@ -10,7 +10,11 @@
 Summary:	Ndiswrapper kernel module
 Name: 		ndiswrapper-kmod
 Version: 	1.59
+<<<<<<< ndiswrapper-kmod.spec
+Release: 	7%{?pre}%{?dist}.17
+=======
 Release: 	7%{?pre}%{?dist}.15
+>>>>>>> 1.80
 License: 	GPLv2
 Group: 		System Environment/Kernel
 URL:		http://ndiswrapper.sourceforge.net
@@ -77,9 +81,21 @@
 
 
 %changelog
+* Mon Mar 30 2015 Nicolas Chauvet <kwizart at gmail.com>
+- Rebuilt for kernel
+
+<<<<<<< ndiswrapper-kmod.spec
+* Mon Mar 30 2015 Nicolas Chauvet <kwizart at gmail.com> - 1.59-7.16
+- Rebuilt for kernel
+
+* Mon Mar 30 2015 Nicolas Chauvet <kwizart at gmail.com> - 1.59-7.15
+- Rebuilt for kernel
+
+=======
 * Fri Mar 27 2015 Nicolas Chauvet <kwizart at gmail.com> - 1.59-7.15
 - Rebuilt for kernel
 
+>>>>>>> 1.80
 * Mon Mar 23 2015 Nicolas Chauvet <kwizart at gmail.com> - 1.59-7.14
 - Rebuilt for kernel