[R-statmod/f15] Update to 1.4.10

[Pierre-YvesChibon]

commit 65844c146f7501a0314686ea969295b171530b27
Author: pingou <pingou at pingoured.fr>
Date:   Wed Jun 22 20:26:59 2011 +0200

    Update to 1.4.10

 .gitignore     |    5 +++++
 R-statmod.spec |    7 +++++--
 sources        |    4 ++++
 3 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 53c6b13..e79efb9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,6 @@
 statmod_1.4.6.tar.gz
+<<<<<<< HEAD
+=======
+/statmod_1.4.9.tar.gz
+/statmod_1.4.10.tar.gz
+>>>>>>> 40ef024... Update to 1.4.10
diff --git a/R-statmod.spec b/R-statmod.spec
index 50dd27b..0bb807f 100644
--- a/R-statmod.spec
+++ b/R-statmod.spec
@@ -1,8 +1,8 @@
 %global packname  statmod
 
 Name:             R-%{packname}
-Version:          1.4.6
-Release:          2%{?dist}
+Version:          1.4.10
+Release:          1%{dist}
 Summary:          Statistical modeling
 
 Group:            Applications/Engineering 
@@ -83,6 +83,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jun 22 2011 pingou <pingou at pingoured.fr> 1.4.10-1
+- Update to version 1.4.10
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 5e57183..44a33f3 100644
--- a/sources
+++ b/sources
@@ -1 +1,5 @@
+<<<<<<< HEAD
 84d3719e4a0609ba2e67d2ddddffa3e6  statmod_1.4.6.tar.gz
+=======
+63e58d372f18510acc2e00470c7b0a10  statmod_1.4.10.tar.gz
+>>>>>>> 40ef024... Update to 1.4.10